diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-06 02:27:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-06 02:27:44 +0000 |
| commit | b593ad60682a6f8c945c4c2ffc3d278df3f6e360 (patch) | |
| tree | 1644e21824a9b57f3e1e0a4d0a86c1f7a73c1914 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5d8343b8e27e766b5bfaaed2f9b1952c0d15da8d (diff) | |
| parent | f1f28d1d86aea6dd1419e94aadf051e433914680 (diff) | |
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 'f1f28d1d86aea6dd1419e94aadf051e433914680':
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