diff options
| author | Jack Yu <jackyu@google.com> | 2015-07-09 00:47:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 00:47:12 +0000 |
| commit | 40f0706293f77c8d185545ee42e33358eba968f8 (patch) | |
| tree | 1f73152e2857a74f0cd2b1ad2577c064713adf60 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 5b65be96ab061cbdba479795ff467c0eab92c28a (diff) | |
| parent | 379aa4389a5d8b5c45d1e1eb7a7cecf02b4ee939 (diff) | |
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 '379aa4389a5d8b5c45d1e1eb7a7cecf02b4ee939':
Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions