tree b767d75cd46b1845a88391d1a01fd0450dfc7c9e
parent fcfb05f7592229fcb549482688b033a1ab935147
parent 860e09ddceb44a2d7ba0434146817983e7b6a1dc
author Adam Lesinski <adamlesinski@google.com> 1465598866 +0000
committer android-build-merger <android-build-merger@google.com> 1465598866 +0000

Merge \\"BatteryStats: Fix read/write parcel order\\" into nyc-dev am: e8a442ccd6
am: 860e09ddce

Change-Id: I9f8cbdd345bf6b5c95cab4360d89efb9909b3dfd