| commit | 32e58223c3ebeb4705796b829efb09aadbd18df3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 11 17:49:42 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 11 17:49:42 2010 -0700 |
| tree | 8fe483b29e1c6a4cfe858e0611ab297f3418963b | |
| parent | 199492337cccc49d87d109b89fa8b8bd6d09cdc8 [diff] | |
| parent | ef3270ad6905ab472559f7f0f4bb7aa2b3b5110a [diff] |
am 89fbcd72: resolved conflicts for merge of c2894474 to gingerbread-plus-aosp Merge commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc' * commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc': Support showing "Cold" battery health.