diff options
| author | Matthew Xie <mattx@google.com> | 2012-12-04 11:25:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-04 11:25:14 -0800 |
| commit | 8b283df989f9b8b71797f9feaeb15cb012ab3190 (patch) | |
| tree | e2afe9eb70b2925c7b4ec6368117f1f0509472e7 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d9e46ac5ffcd2a1b3abf70bde14af7d10ebf018b (diff) | |
| parent | b6b4f171ff38ccac833edb2a1ad7f725ed068d46 (diff) | |
am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev
* commit 'b6b4f171ff38ccac833edb2a1ad7f725ed068d46':
Change getName and getAddress permission to BLUETOOTH
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions