| commit | 8f0d61e3bf078987e2a744fb8bd8fcf25213caf4 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Fri Jun 10 22:57:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 10 22:57:57 2016 +0000 |
| tree | c833cc8e2068687c64383b5647242e4e4b7aefc9 | |
| parent | c841f7c1fb0ebabd4b3416ad6ad897b9a7f17263 [diff] | |
| parent | d1640f032053d7eda0f810d46a2251904db4c0b0 [diff] |
Merge \"Merge \\\"BatteryStats: Fix read/write parcel order\\\" into nyc-dev am: e8a442ccd6 am: 643fc8341a\" into nyc-mr1-dev-plus-aosp am: d1640f0320 Change-Id: I2a421d8b4958809839973140f4f5d9fc4f42186e