tree 31ef7ae0fb8db3aa4a2caa95ff4281f2dd70adfc
parent a0c2b53966238125143dec01d3f2598a8b9e33a2
parent 169741b70880607701d704262dd9b386fcfd083d
author Amith Yamasani <yamasani@google.com> 1278017487 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1278017487 -0700

Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread