diff options
| author | Matthew Xie <mattx@google.com> | 2011-11-09 21:51:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-09 21:51:01 +0000 |
| commit | ea57ede544bd61fe5c5e096466e9d046dfd36b50 (patch) | |
| tree | 36eb5203287ee6bbddec26100e3c83ff55afbca5 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bd958e4428263eac17107a33d54a2751c37cc0b7 (diff) | |
| parent | 3a6f9ded543db6cb7a2842540a2b67b0356b21ae (diff) | |
am 3a6f9ded: am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
* commit '3a6f9ded543db6cb7a2842540a2b67b0356b21ae':
Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions