tree d7d8df034fb6e479de62e4cd86dbdbe2b2c4d8f9
parent a26823d96deee9752a7f21ad6bba5e5276f52a00
parent b02a58740ec285e715d169c11801dd33a2dc7086
author Tianjie Xu <xunchang@google.com> 1469751162 +0000
committer android-build-merger <android-build-merger@google.com> 1469751162 +0000

Merge \\"Add docs on regeneration background text image\\" am: 5aa2e104c0
am: b02a58740e

Change-Id: Ib15f443946a97eeb6609b0aab9b91bcd3ca91d4c