am 2cc2c75d: (-s ours) am c7dacb73: Merge "DO NOT MERGE: Add a battery...
am 2cc2c75d: (-s ours) am c7dacb73: Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread
Merge commit '2cc2c75d'
* commit '2cc2c75d':
DO NOT MERGE: Add a battery capacity value to the power profile.