Android Build Merger (Role) 83ae6653ca Merge "Merge "ConnectivityManager: fix style issue" am: e74f3adba5 am: ec54a40339 am: ec7447b291" into oc-dr1-dev-plus-aosp

2017-06-22 19:48:19 +00:00

..

java

Merge "Merge "ConnectivityManager: fix style issue" am: e74f3adba5 am: ec54a40339 am: ec7447b291" into oc-dr1-dev-plus-aosp

2017-06-22 19:48:19 +00:00

jni

Merge "Add an extra level of indirection to make sure that native IHwBinder" am: b6dde12ef0 am: e7191f50b5

2017-06-19 22:26:46 +00:00

proto/android

…

res

resolve merge conflicts of 187fe9d5cf to oc-dr1-dev-plus-aosp

2017-06-22 12:20:52 -07:00

tests

Copy smearing method to BatteryStatsHelper

2017-06-09 21:15:56 +00:00