Sudheer Shanka 5618d79349 Merge "Use correct timestamps of events for logging." into oc-dev ...

am: 2ca51820f0

Change-Id: I863f048dd4b95c0f9278fe8aefc432f852b82eae

2017-06-15 19:34:11 +00:00

..

java

Merge "Use correct timestamps of events for logging." into oc-dev

2017-06-15 19:34:11 +00:00

jni

Merge "Add a workaround for simulate secondary display" into oc-dev

2017-06-14 20:25:03 +00:00

proto/android

Prune unused static libs and instant apps if space needed

2017-05-31 02:30:41 +00:00

res

Merge "Protect broadcast used in settings for bond cancel" am: 5cfbbce162

2017-06-12 22:57:58 +00:00

tests

Copy smearing method to BatteryStatsHelper

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