diff options
| author | Justin Ho <justinho@google.com> | 2010-10-15 18:24:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:24:30 -0700 |
| commit | e35cd5f569fe760385198f485e4610ad13033dd3 (patch) | |
| tree | 9ef544393d67f83d924ce03679676dec50a08894 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d687504e73b9d4a41b7ba28de864b4f3ab5c48e4 (diff) | |
| parent | 73dbdc35d4db5a03310bec8d8d7dcb58dba0c940 (diff) | |
am 73dbdc35: Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread
Merge commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940' into gingerbread-plus-aosp
* commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940':
DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions