tree cf230368696562e4ccb25a830a3071d32fd5e8f7
parent ff4c4e48399e0c83472fc5a94fe02eef258a364c
parent 168a8d35c5320e4ea4df0fdd8b459cf3e5e2daa7
author Tianjie Xu <xunchang@google.com> 1506535112 +0000
committer android-build-merger <android-build-merger@google.com> 1506535112 +0000

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

Change-Id: I46db96d43814880dfae20b38379724f8dea51452