tree 6066d58e37b89d85081c1f32ca5b406437b159fa
parent 9c5655a4e4064a3b2f50756f3c4c941d491420ab
parent ef45a88680ee00fe2283ee68dab884b150dc45ab
author Sen Jiang <senj@google.com> 1481754108 +0000
committer android-build-merger <android-build-merger@google.com> 1481754108 +0000

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

Change-Id: I22e054d7fa4ca9986d6b9b3e625a2cbd8449aaa1