diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-07-10 19:32:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 19:32:12 +0000 |
| commit | fc9f21f701b484b387f37cf3a567ed528c4fa3b2 (patch) | |
| tree | 4ce3b711d6cb0f4c71c1da47a8e92d1491377feb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3b8d4349facccbe1475c6d39855e895d5ba11974 (diff) | |
| parent | cc5cd90029a1968ec3126f73735fef3234a31678 (diff) | |
am cc5cd900: am e84c6b37: am 2cef47ff: am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev
* commit 'cc5cd90029a1968ec3126f73735fef3234a31678':
Enable EMERGENCY mobile connections.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions