diff options
| author | John Wang <johnwang@google.com> | 2011-06-16 17:20:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-16 17:20:06 -0700 |
| commit | 1c4438243d58b9844bd7406aa2f0a75029ca9743 (patch) | |
| tree | 1f0b1d7d6996e90aab11abbb13b499be2ca987b2 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3a3efe756389cbda3ddf74c0c55d7a3ce68f3780 (diff) | |
| parent | e21217af6480c45212517a68b2b6e583c4dc27c9 (diff) | |
am e21217af: (-s ours) am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'e21217af6480c45212517a68b2b6e583c4dc27c9':
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