Andreas Gampe 985d9958fe Merge "EventLogHelper: Clean up code" am: 386a5687dd am: 9b24969314 ...

am: 6f42d696df

Change-Id: I8de0d17c3fb50d7065e662235e4018268fa745b9

2017-10-11 16:18:18 +00:00

..

java

Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e" into oc-mr1-dev

2017-10-10 22:30:23 +00:00

jni

Merge "EventLogHelper: Clean up code" am: 386a5687dd am: 9b24969314

2017-10-11 16:18:18 +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