tree 772d13e0103a1b868fbb4c22e3e664eeb6b55430
parent 27f68794eb9c8e625520739226351475dda125b6
parent b29f25888a9033a0cc3b151a929b1b29fa727f75
author Sen Jiang <senj@google.com> 1481755246 +0000
committer android-build-merger <android-build-merger@google.com> 1481755246 +0000

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

Change-Id: I32cdf7fb4a467b16a9d1c746d6c90539740cd211