tree cc3e0e508a67b8ad01ccfc0c7e412e99acfc4725
parent 8494db31cb734463fde5b4a3f69806ed35fccb54
parent 968c247b9a651444be97a156dc62e55c5b66c0a7
author Rick Yiu <rickyiu@google.com> 1539241172 -0700
committer android-build-merger <android-build-merger@google.com> 1539241172 -0700

[automerger skipped] Merge "Add null check for vrManager" into pi-dev am: dd7047b4e8
am: 968c247b9a  -s ours

Change-Id: Id6e5c2f2f18464d7a0c2cd3f34daabd385b9bc76