tree d0e940373a956561f45cc68f44ade2b673a95da2
parent 53c34ebdc41e1db7c1e4a1998b7376a0dc9cae9a
parent c6d607f6bad40333a9fa3d544f4f1db822bc9b52
author Tianjie Xu <xunchang@google.com> 1469744435 +0000
committer android-build-merger <android-build-merger@google.com> 1469744435 +0000

Merge \\"Regenerate the background text with pngcrush\\" am: 7b6263960f
am: c6d607f6ba

Change-Id: Id840cc2ce8a3c50193a72f9083b0f5f65c497dec