tree 3c20cad586a2db23f0a495f1165715a64cb79c28
parent 47a78999ea8719359bf704db3bbe96db214d51fd
parent faf36e04ed6f7e7b92a90ce7fc4ecc113eee4993
author Elliott Hughes <enh@google.com> 1461803481 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461803481 +0000

Merge "Update recovery UI." into nyc-dev