tree 20e787156857b7723e3f76cec6d43b479934c217
parent 28459ffde38855c2792594316a4217f02a9ea827
parent 547d5fd559350376cfd577fcd0dc7d4c35a23911
author Tao Bao <tbao@google.com> 1505168020 +0000
committer android-build-merger <android-build-merger@google.com> 1505168020 +0000

Merge "ui: Move locale and friends into ScreenRecoveryUI class." am: fc570c317b am: 166188c2c6
am: 547d5fd559

Change-Id: Ic6ef12b7e4a25fb7cfcd5e79c8784bf764fda6b4