commit | 02241ab2929c34aa48acdf4befcc9cacd86c1a6f | [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 | d8c5accddfb06cf620d40deb095aee851b118d73 | |
parent | 76f8688e9b9a71cb064119022a3f69c2e17b8b65 [diff] | |
parent | 89fbcd72fbe6ef26ea2703f8e338fd198c958ecc [diff] |
am 89fbcd72: resolved conflicts for merge of c2894474 to gingerbread-plus-aosp Merge commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc' * commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc': Support showing "Cold" battery health.