tree 0d4f608321ba1e29bc5b2aca3aca1fc256fe498f
parent 2d161b1d3fd8ceae065d8a475d2ca13de1b48dc2
parent ebc1b48922d5cb7abcf0bc51e9a092079a837556
author TreeHugger Robot <treehugger-gerrit@google.com> 1491004098 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1491004102 +0000

Merge changes from topic 'launch-2d-activities-vr' into oc-dev

* changes:
  Allow shell uid to access Vr APIs
  Add vr persistent mode enable/disable
  Launch 2D activities in VR mode