tree 0211d0bd9f0acb35cd74d129f9372dbcc92d80a6
parent 80eb02dcbf1700e2a0738512509d3d705d1511b8
parent 850e00951a8199cc89357b091cb4b60d15aa0b10
author Luke Song <songwalker@google.com> 1497658297 +0000
committer android-build-merger <android-build-merger@google.com> 1497658297 +0000

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

Change-Id: I498b7b568523631f41f92994a003e77492616916