diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-07 14:15:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-07 14:15:17 -0700 |
| commit | 75f0024cf40eadb2cdaa6ae53409c515b68f21c1 (patch) | |
| tree | ffcf4f192bc279870efc09df2de743dfe013923b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 05dff838946abb01caa3c3172cf0f367964a0b6d (diff) | |
| parent | 6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026 (diff) | |
am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread
Merge commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026' into gingerbread-plus-aosp
* commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026':
Fixes to battery stats debug output.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions