diff options
| author | Matthew Xie <mattx@google.com> | 2013-04-24 18:48:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-24 18:48:16 -0700 |
| commit | 283537d5d2293d9ecedf1fa65e9cd3d218144021 (patch) | |
| tree | 20ba7d582ef47ea31749cdaa5156181156bc0bde /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 59b095df72668315885d7a018819dfcc46318d31 (diff) | |
| parent | b0225f41da77ebe7ebfccb6166021d324b4d6512 (diff) | |
am b0225f41: am a6631f57: Merge "Change permission of LE scan APIs from BLUETOOTH to BLUETOOTH_ADMIN" into jb-mr2-dev
* commit 'b0225f41da77ebe7ebfccb6166021d324b4d6512':
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