tree 47a45ad2ad2d7670bcfca29e8b31d146dececdc0
parent 94565fd5f9b38a06d3d78586a78ae3f121ade671
parent b6faf00b9b32dcc0a4d36a2addb7e3d6fedf35db
author Elliott Hughes <enh@google.com> 1461809658 +0000
committer android-build-merger <android-build-merger@google.com> 1461809658 +0000

Merge "Update recovery UI." into nyc-dev am: 2f1eedd am: 21092a9
am: b6faf00

* commit 'b6faf00b9b32dcc0a4d36a2addb7e3d6fedf35db':

Change-Id: I459448944a775e8bb313aa31fe61bc61213b847d