tree 48e79b393524be8a1bbc81d275696d6df15b2cd4
parent 03dab3e56240e6ae5f8bd471ac190fe0a90b5bcd
parent 3166593f4e8e7ccfdecfca010fd8d22b5e219487
author Daniel Sandler <dsandler@android.com> 1460573900 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1460573902 +0000

Merge "Fix NPE when the vr manager isn't around at first." into nyc-dev