[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: e02e3c7eb1 -s ours am: a0919e8adb am: 9e89ab20b1 am: f022856b81 -s ours

am skip reason: subject contains skip directive

Change-Id: I37572c55b22bf70f54985117c94742dd6d7262e3
tree: e042ea01b41f2088f177e022bf7644c2c6cce023
  1. Android.mk
  2. LICENSE
  3. MODULE_LICENSE_APACHE2
  4. vr-845.c
  5. vr-8998.c
  6. vr.c
  7. vr_int.h