diff options
| author | goneil <goneil@google.com> | 2017-12-27 21:46:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-27 21:46:43 +0000 |
| commit | 16bac7483d82c7071706d5f29eebeadfc1cb7abb (patch) | |
| tree | ab2ed1ac73b5c7cbe56574d87e7b072293501d07 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0998a81f5a36bdf19321c5e03ae0722b9691840d (diff) | |
| parent | 663150a70857430fe9c6ab6db039e8e541bff702 (diff) | |
Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions" am: ee48176ad6 am: f220cdfca4
am: 663150a708 -s ours
Change-Id: I6afc251ec22979c349f5255a9c6b297e008818ea
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions