diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-20 19:33:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-20 19:33:50 -0700 |
| commit | caa9aa08aaa5d3e879fcccad5c4bcb1c79fba6e3 (patch) | |
| tree | abb5462ea7c8ebbd632578d11e659bb44b502d24 /graphics/java/android/renderscript/ProgramFragment.java | |
| parent | fde5e965d48b2f3f8672f720e8a95ad647c7a214 (diff) | |
| parent | 0ce12e210eaef554e96752af2553dadc431d6d09 (diff) | |
am 0ce12e21: (-s ours) am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread
Merge commit '0ce12e210eaef554e96752af2553dadc431d6d09'
* commit '0ce12e210eaef554e96752af2553dadc431d6d09':
DO NOT MERGE. Wifi service now blames apps for its wake lock use.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions