diff options
| author | Jack Yu <jackyu@google.com> | 2015-07-24 05:13:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 05:13:59 +0000 |
| commit | 9a06d1c567045251e660e72e9486ba633fdd9803 (patch) | |
| tree | 7f68eebc4b2f587dea4cf86b765b7c6885487e3b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 13844231eb9bffac7e47acb60c03c7c04bc8dcc3 (diff) | |
| parent | 1643493e97c8904d3215c66bcd15985e72631e69 (diff) | |
am 1643493e: am de978817: am e0dc2394: am 8ac962a7: am e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev
* commit '1643493e97c8904d3215c66bcd15985e72631e69':
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