tree 5a5127b8416c3e0ec081bab768c71367a3772112
parent 8afc15afc726c0c5f5f9bf777639c36b69896d3a
parent 1e79be9f0a6595cfd3cfadb272e2692197098767
author Dan Sandler <dsandler@android.com> 1460574454 +0000
committer android-build-merger <android-build-merger@google.com> 1460574454 +0000

Merge "Fix NPE when the vr manager isn\'t around at first." into nyc-dev
am: 1e79be9

* commit '1e79be9f0a6595cfd3cfadb272e2692197098767':
  Fix NPE when the vr manager isn't around at first.

Change-Id: Ie0af1a0404aee098b4d2c7e3d884ad45bce7543d