diff options
| author | Jack Yu <jackyu@google.com> | 2015-07-09 01:14:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 01:14:34 +0000 |
| commit | f99e20d6c5e58e357228fd97d840256f33f91de5 (patch) | |
| tree | 0fcd15cfd8acace5390ee7d8a25ff8defd144cc3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2cd92043c70fefb2534a8e26e5283193e8a7ebd1 (diff) | |
| parent | 230629de49b032dfe92ce31b97e261ff962b04c2 (diff) | |
am 230629de: am 40f07062: am 379aa438: am 6b7a0784: Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev
* commit '230629de49b032dfe92ce31b97e261ff962b04c2':
Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions