Andrew Scull 8203155664 resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 ...

am: 3c9b36482f

Change-Id: I2eb73ac546ce8be144ec96fcac573caa2c5e8a13

2017-01-13 21:23:27 +00:00

..

java

resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1

2017-01-13 21:23:27 +00:00

jni

Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am: 2225a0640b

2017-01-12 15:46:20 +00:00

res

Add support for carrier demo mode

2017-01-13 21:04:31 +00:00

tests

Add Brightness setting for VR Mode.

2017-01-11 03:12:05 +00:00