tree fc60cc302ea1176a5f987b8a9fdd251f54d69707
parent cce9b2c96a3e1b8ed636c433a9fa5887890b2f1f
parent 166188c2c644035195425a87892aac164f8c9bfe
author Tao Bao <tbao@google.com> 1505167420 +0000
committer android-build-merger <android-build-merger@google.com> 1505167420 +0000

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

Change-Id: I8f5010df98eb10f117a4391a107f956e8bbb97f4