| commit | 827d36076110e73b8b95ebdd17a46986564983d7 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Thu Jul 01 13:55:26 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 01 13:55:26 2010 -0700 |
| tree | f4963c6371282f1c152ee2273428e9693110a39e | |
| parent | 7d95278f1621d548e211de9c33b1b0466e9bd461 [diff] | |
| parent | 03bf3721c0c9e18fb0ba7cb81a54386d3bceec49 [diff] |
am 2cc2c75d: (-s ours) am c7dacb73: Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread Merge commit '2cc2c75dccc08ecbffb44a47463df9a139e2786e' * commit '2cc2c75dccc08ecbffb44a47463df9a139e2786e': DO NOT MERGE: Add a battery capacity value to the power profile.