diff options
| author | Elliott Hughes <enh@google.com> | 2014-10-13 22:04:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-13 22:04:11 +0000 |
| commit | c02ddd6a0a4643ce49150231a104d77d90c13f27 (patch) | |
| tree | 89083e38748cf32507f08830551739cd307688f4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c4d774d5d87439180eed0be45eb2242f8bf7cfaa (diff) | |
| parent | c130b428c5d7eb25dc7651c5cea82182f2241ddf (diff) | |
am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev
* commit 'c130b428c5d7eb25dc7651c5cea82182f2241ddf':
Ensure that the SIM language doesn't override the user language on the encryption UI.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions