diff options
| author | Jack Yu <jackyu@google.com> | 2015-07-09 00:37:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 00:37:41 +0000 |
| commit | 379aa4389a5d8b5c45d1e1eb7a7cecf02b4ee939 (patch) | |
| tree | 96c6d7111c8a093add724f4a7ed617c4afcc8157 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 370c27c7fe308e351d375295d422df76f7ede164 (diff) | |
| parent | 6b7a07848b21001a41aea1b6426ec2f75ea652ec (diff) | |
am 6b7a0784: Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev
* commit '6b7a07848b21001a41aea1b6426ec2f75ea652ec':
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