tree 4ce018893e091c21392e022432a50b4a84eb79cd
parent 88fd6aff388cf50a6c596d31b2eba6f5bf596648
parent 8874d3c3095a87ad546b7a7c84a7fa17c35a5f3a
author Tianjie Xu <xunchang@google.com> 1506534557 +0000
committer android-build-merger <android-build-merger@google.com> 1506534557 +0000

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

Change-Id: I678eb4f5e3ebee72f519bd0a9b3fd76cbcf18d7c