Merge "Merge \\"BatteryStats: Bump checkin format version to 18\\" into nyc-dev am: d75bc225ac am: 69a983dfec" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
5185fe5958