diff options
| author | Baligh Uddin <baligh@google.com> | 2014-05-01 16:25:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-01 16:25:29 +0000 |
| commit | 4a26164316b0d9a6d97dfbb85a2ac176384bb985 (patch) | |
| tree | e1c842da6a71a8f81864aa8cc753416605e8e732 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4fb660cb6ac9b96cfd649b411a24ba8a2a96c4fc (diff) | |
| parent | 1ffec559d04618fbd31eaf972a81c6df324965c1 (diff) | |
am 1ffec559: (-s ours) am bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '1ffec559d04618fbd31eaf972a81c6df324965c1':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions