Mathew Inwood 627a84c26a resolve merge conflicts of 606d3975b23ec725085f8ae16ba4074fd05a556a to stage-aosp-master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Iaed1cd6bc7419597510bfc1ab30a169f75e4ae3f
Merged-In: I681c1e97d0929cfb1d357b2243ecb210d18f9e87
Change-Id: I01782459e2b02f065671da640d675b898b4727fe

2018-08-06 16:30:26 +01:00

..

java/com/google/vr/platform

Revert^2: Greylist com.google.vr.platform hidden methods

2018-08-03 11:33:26 +00:00

Android.bp

Mark installable jars with installable: true

2018-07-10 14:30:07 -07:00

com.google.vr.platform.xml

…

dvr_library_loader.cpp

…