diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-11 17:49:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-11 17:49:42 -0700 |
| commit | 02241ab2929c34aa48acdf4befcc9cacd86c1a6f (patch) | |
| tree | d8c5accddfb06cf620d40deb095aee851b118d73 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| 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.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions