Android CTS 11.0 Release 10 (9264946)
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: b6c5e6a881 -s ours
am skip reason: subject contains skip directive

Change-Id: I808d69d15e7c9554b85fc0d264fd0d04a3dd56c8
tree: d3310d428d7a4cef640acff4ac7d072a2502678d
  1. Android.mk-
  2. vr-845.c
  3. vr-8998.c
  4. vr.c
  5. vr_int.h