diff options
| author | Jack Yu <jackyu@google.com> | 2015-09-16 21:02:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-16 21:02:48 +0000 |
| commit | 717e39df1c43806f3aa373f52c14f8b282f325b4 (patch) | |
| tree | 75d2c7afa72d875652da70499e088e888ad8e347 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ee16be69f1c3b3a9d6cdcb8bde70be3f7a0dbb65 (diff) | |
| parent | 870a9e6a783c7755b059d8533ae0232873bff9ba (diff) | |
am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev
* commit '870a9e6a783c7755b059d8533ae0232873bff9ba':
Added a carrier config key for emergency messages on/off option always showing.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions