tree 38350f4d45ba16054a1ec92690a2f92581cc11a4
parent 1dbcc262c5a896e2bd3ea04c45ba30db9f1d81c3
parent d020369b77fd2cf696720e9f87dc0e353d0fa112
author Karthik Ravi Shankar <karthikrs@google.com> 1491005532 +0000
committer android-build-merger <android-build-merger@google.com> 1491005532 +0000

Merge changes from topic 'launch-2d-activities-vr' into oc-dev am: f04d039584
am: d020369b77

Change-Id: I42e7ebe0f930457391caced6ed2e14c668aab41a