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