tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 75b75cca1bc2de506810fa78bf0349df263b6d30
parent a9a7b44b18e65f9d51b638c74d931376bfd8a240
author Chris Wren <cwren@android.com> 1392410165 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410165 +0000

am a9a7b44b: am b48361b1: am b86f0769: use PNG as the transport encoding for images

* commit 'a9a7b44b18e65f9d51b638c74d931376bfd8a240':