| commit | b8b029c5f81699ca74f42e00eaff2d88dcfe8167 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Jun 09 22:26:02 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 09 22:26:17 2017 +0000 |
| tree | ba491c821ad1b90b2b197eac1c7364b9871d9220 | |
| parent | aa8380fa22739fb6ae64669a7c8e5bc886b9028e [diff] | |
| parent | 83e0d1dfc11545c2f81050cecd14018ad7907504 [diff] |
Merge changes from topic 'am-231d306b0fd9428893b0e824a72c78bf' * changes: Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859 am: 308d0dd03c am: f15e4e77f6 Copy smearing method to BatteryStatsHelper am: 5dad8068e2 am: 5047d7bf7f -s ours am: 289b74555f -s ours