tree 6066d58e37b89d85081c1f32ca5b406437b159fa
parent e97575e7ae4c5a540381d89b81eea1c5a142b639
parent 2f8f6ec0fc2af4d4afd7d19837442222a1342156
author Sen Jiang <senj@google.com> 1481753266 +0000
committer android-build-merger <android-build-merger@google.com> 1481753266 +0000

Merge "Add a stub recovery UI." am: 8c1584feaf
am: 2f8f6ec0fc

Change-Id: I8acb01933efe7d8d69a608cc9801bf717fae4486