commit | b8282588b78af99c625740f6a7b8844b6e6b7713 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 04 18:47:39 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 04 18:47:39 2011 -0700 |
tree | 7a375165c96b754d82ba1b6c304084645a5197bf | |
parent | 1d881289edbb40ba6cd1429ad5686f6060568177 [diff] | |
parent | 17b24482db9fb75020b91a9c17f2014beebc86ed [diff] |
am 17b24482: Reconcile with gingerbread-release gingerbread-mr4-release * commit '17b24482db9fb75020b91a9c17f2014beebc86ed': Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE