Robert Sesek f43d5b36d6 Merge "resolve merge conflicts of 7031dac to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp

2016-10-13 18:55:37 +00:00

..

java

Merge "resolve merge conflicts of 7031dac to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp

2016-10-13 18:55:37 +00:00

jni

Merge "jni: move security interfaces to private" am: 07bc1ee77d am: 82df72dc1f

2016-10-07 15:24:39 +00:00

res

DO NOT MERGE: Ambient light sensor changes for doze mode.

2016-10-13 07:53:55 +00:00

tests

Merge "Debug: Add test for bug 31943543" am: 7c4efe421c am: afe73c0c3c

2016-10-07 00:58:37 +00:00