tree cba62d0d64153aa2169651696bc238591341d679
parent 7cb06a93886c40917e89bc76207333be3a7e16c5
parent 55d60095b6573d6ea01bf8ee7548b5c233c6b102
author Chris Wren <cwren@android.com> 1414085254 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085254 +0000

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

* commit '55d60095b6573d6ea01bf8ee7548b5c233c6b102':