tree 10da860fcff71886af91d082e31f0e1917926848
parent 54c3e062dd1df82dd26bed6f5a98f26c0e2fa632
parent 376c9a285bec962dfcf8db4cdd8a6a5bad631490
author Chris Wren <cwren@android.com> 1414566159 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566159 +0000

am 376c9a28: am 55d60095: am b7dc4ff8: am a9a7b44b: am b48361b1: am b86f0769: use PNG as the transport encoding for images

* commit '376c9a285bec962dfcf8db4cdd8a6a5bad631490':