diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-14 12:31:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-14 12:31:07 -0700 |
| commit | 227afd3a1b1a32891e5e20c79fd98b2ccf982426 (patch) | |
| tree | ce8b71e86b345be35468e35b50e5259922369497 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 86e1991428c2bc78354965c51b2821ae16f32a55 (diff) | |
| parent | 1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b (diff) | |
am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread
Merge commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b' into gingerbread-plus-aosp
* commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b':
Fix problem where power manager was calling battery stats with bad wl type.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions