diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-06 02:31:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-06 02:31:03 +0000 |
| commit | 867680342e12af59a26756f30cf817a131724943 (patch) | |
| tree | 426404d89843b3c55b4cfa370e8669423157074e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f99fc5405ea909e8fdea3446646afd8b26229c18 (diff) | |
| parent | b593ad60682a6f8c945c4c2ffc3d278df3f6e360 (diff) | |
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 'b593ad60682a6f8c945c4c2ffc3d278df3f6e360':
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