Merge commit 'c7dacb7374e04c003b0764e7c348765b629c18cb' into gingerbread-plus-aosp * commit 'c7dacb7374e04c003b0764e7c348765b629c18cb': DO NOT MERGE: Add a battery capacity value to the power profile.
Merge commit 'c7dacb7374e04c003b0764e7c348765b629c18cb' into gingerbread-plus-aosp * commit 'c7dacb7374e04c003b0764e7c348765b629c18cb': DO NOT MERGE: Add a battery capacity value to the power profile.