diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-02-23 14:41:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-23 14:41:01 -0800 |
| commit | 17f49e4f91c04290721dc029b73b9a430f5298d5 (patch) | |
| tree | 1237e538dc34ef40858dee2f4f3474577c0130a3 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | eaf997258de54e5272e51535b4332d5deec953d7 (diff) | |
| parent | b0e5326d8cc661448a7ff611d02d439d4a328a3d (diff) | |
am b0e5326d: (-s ours) am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
* commit 'b0e5326d8cc661448a7ff611d02d439d4a328a3d':
DO NOT MERGE No backup of country and sleep policy
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions