tree 7a375165c96b754d82ba1b6c304084645a5197bf
parent 1d881289edbb40ba6cd1429ad5686f6060568177
parent 17b24482db9fb75020b91a9c17f2014beebc86ed
author The Android Open Source Project <initial-contribution@android.com> 1312508859 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312508859 -0700

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