diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-03-11 15:17:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-11 15:17:44 -0800 |
| commit | 66a09d0a178df6a4edd7ea700976eef52a56f669 (patch) | |
| tree | 884957e89a84813191c88095dbb80a7b3f1ca500 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d96d1be7bd4ba6ebb3e4653ab39f36988b9727cc (diff) | |
| parent | 618377d83d4a280c2e0f89642bfb1046d387ad7d (diff) | |
am 618377d8: Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '618377d83d4a280c2e0f89642bfb1046d387ad7d':
Don't accept a user-defined dun-capable connection
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions