diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-15 11:38:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 11:38:47 -0700 |
| commit | eba36ff80dff139f4ba0bde7ccc53ff2bef4ba15 (patch) | |
| tree | dd20705357460185deec86d781c4bece78c8d7c6 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 088fbbc7b68844d40854a77c07cce0634a6d4c52 (diff) | |
| parent | 227afd3a1b1a32891e5e20c79fd98b2ccf982426 (diff) | |
am 227afd3a: am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread
Merge commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426'
* commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426':
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
