diff options
| author | Matthew Xie <mattx@google.com> | 2013-04-24 18:46:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-24 18:46:00 -0700 |
| commit | b0225f41da77ebe7ebfccb6166021d324b4d6512 (patch) | |
| tree | e36a0bae63830b54d8c492b7f7110c84056d619b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ad6ff205afc24889f650105f23397e0af9e65e4f (diff) | |
| parent | a6631f57fa49c00d722f6d521b9882781be6dfa0 (diff) | |
am a6631f57: Merge "Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN" into jb-mr2-dev
* commit 'a6631f57fa49c00d722f6d521b9882781be6dfa0':
Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions