diff options
| author | Jack Yu <jackyu@google.com> | 2015-07-24 03:07:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 03:07:57 +0000 |
| commit | e0dc239420907d48c5f0d63bccfec3b7dcee3135 (patch) | |
| tree | 564e952f46e44341863aed9f8f56bf6988a0a093 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c5246d9fef695a848e2523702dc9f752e94bc6e9 (diff) | |
| parent | 8ac962a778f64bdd07e938d4e993f48615d3bc9e (diff) | |
am 8ac962a7: am e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev
* commit '8ac962a778f64bdd07e938d4e993f48615d3bc9e':
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