Adam Lesinski 67ee88e8ad am 8b7beaec: am 8197e2de: am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev ...

* commit '8b7beaecffde9a98b50cd33be893b7944f2ab271':
  Fix asymmetry in parceling/unparceling code for BatteryStats summary

2015-09-29 23:45:28 +00:00

..

java

am 8b7beaec: am 8197e2de: am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev

2015-09-29 23:45:28 +00:00

jni

am f21beb12: am 899110f3: Merge "Add exported include dir for libandroid_runtime"

2015-09-28 21:30:46 +00:00

res

am 81451c1c: am cb4bafb4: am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev

2015-09-28 17:45:40 +00:00

tests

am b57dd722: resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 17:14:10 +00:00