tree 7c186e16254ac99cec94c7372dae8ac8381a4717
parent 2d738e620a666913f4bea0e12f4ac62538843cad
parent 3644617e3d297a29d6cb4c3d56953206533f6fbc
author Tao Bao <tbao@google.com> 1505169163 +0000
committer android-build-merger <android-build-merger@google.com> 1505169163 +0000

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

Change-Id: I3aef0a888ebdd0ed38f910ab51848a8e54bb4355