diff options
| author | Jack Yu <jackyu@google.com> | 2015-07-24 03:37:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 03:37:01 +0000 |
| commit | de97881796d7062a577ee0397c802d3825c65d4d (patch) | |
| tree | d309d91c49a4b438dc6d826e5ed3b1a89dff35a9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 06cec5f51850898e4a3bd4a164d186c61ba2192e (diff) | |
| parent | e0dc239420907d48c5f0d63bccfec3b7dcee3135 (diff) | |
am e0dc2394: am 8ac962a7: am e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev
* commit 'e0dc239420907d48c5f0d63bccfec3b7dcee3135':
Allow carriers to force disable ETWS/CMAS test messages.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions