diff options
| author | Justin Ho <justinho@google.com> | 2010-10-14 21:48:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-14 21:48:20 -0700 |
| commit | d738407ce49c9020ace16e973baa248550445bc7 (patch) | |
| tree | 24319683f246c43300aa32f54f99ea214d614a3b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4fe18a4998ad1d3d0a62a6b35f9225304c34ef00 (diff) | |
| parent | c42d196f969e1d7f588e5e397176557c4c97575f (diff) | |
am c42d196f: (-s ours) am 33bae9b8: Updated lockscreen asset (Hiroshi), new menu background
Merge commit 'c42d196f969e1d7f588e5e397176557c4c97575f'
* commit 'c42d196f969e1d7f588e5e397176557c4c97575f':
Updated lockscreen asset (Hiroshi), new menu background
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions