tree 60402426b1ffd366c84bd74be8e5c0851a4f038c
parent bffbd487fcf91cde111f655b2cc0314de7779145
parent 1cd2fda40bbc45de07000010c4eb9ecd4fb7b5c0
author Tianjie Xu <xunchang@google.com> 1469746457 +0000
committer android-build-merger <android-build-merger@google.com> 1469746457 +0000

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

Change-Id: I5f7f0d932c34499438641830e550e7e530433907