Chad Brubaker 15e12ff1fa Merge "Expose RECORD_AUDIO to Instant Apps" into oc-mr1-dev ...

am: cffe04a719

Change-Id: I35ca80db5df3cce385020e3192f82f38d6c033d7

2017-10-09 23:26:26 +00:00

..

java

Merge "Update ANOMALY_DETECTION_CONSTANTS javadoc." into oc-mr1-dev

2017-10-07 00:37:06 +00:00

jni

Merge "SecurityLog: Apply 7b25bb8 to SecurityLog" am: a98866a6b6 am: a25528b085

2017-10-09 23:13:59 +00:00

proto/android

…

res

Merge "Expose RECORD_AUDIO to Instant Apps" into oc-mr1-dev

2017-10-09 23:26:26 +00:00

tests

Merge "Add AOD metrics in batterystats" into oc-mr1-dev

2017-10-06 07:17:25 +00:00