diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-06 02:34:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-06 02:34:40 +0000 |
| commit | f3e7945c79557cfd4d667caeacf69ee197508535 (patch) | |
| tree | b6563edea58fd7f3219976ebc8b1f908c4c1aa22 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ccd3a6a519030989c18371c1d58d6d3632de78ee (diff) | |
| parent | 867680342e12af59a26756f30cf817a131724943 (diff) | |
am 86768034: am b593ad60: am f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice."
* commit '867680342e12af59a26756f30cf817a131724943':
Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions