diff options
| author | John Wang <johnwang@google.com> | 2011-06-16 17:14:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-16 17:14:28 -0700 |
| commit | e21217af6480c45212517a68b2b6e583c4dc27c9 (patch) | |
| tree | d649715f7d4d36fc3fc1b7706ce4d4ca831b393b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 769bf5d59ef1b6a9bce9d64d9761def735d6af65 (diff) | |
| parent | c6b32054c67901b0627ad99e4bd8b15c5cc2fb90 (diff) | |
am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
Revert "Do not merge. Return null id for Non-phone device."
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions