tree 107bcb564994dfcf8df5e9191740847df93ff731
parent 14307c0c5f3b98087d7cc84e189d71ed9a1c33ee
parent 8daabacce58ba1adf9e059fb98b24f765b893f62
author Luke Song <songwalker@google.com> 1497658839 +0000
committer android-build-merger <android-build-merger@google.com> 1497658839 +0000

Merge "Introduce VR recovery ui" am: 5efe2bca22 am: 850e00951a
am: 8daabacce5

Change-Id: I7aaad686f788672b9fd8be2173c7b9976c19e04f