tree a2e987aae91fdcbc90a49c63948416e94b95d38e
parent 4167aa25d6eb08ee32c6b61312b3b171f99d563a
parent 5e969aa10d5ab75e52dccaebbb367473a586f642
author Tianjie Xu <xunchang@google.com> 1506534752 +0000
committer android-build-merger <android-build-merger@google.com> 1506534752 +0000

Merge "Add a new option in recovery menu to test the background texts" am: 4c7608f3ca am: 8874d3c309
am: 5e969aa10d

Change-Id: I59c1cee7aa7a67bd01d5c31c2af6e5390463c88e