diff options
| author | Baligh Uddin <baligh@google.com> | 2014-05-13 15:46:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 15:46:07 +0000 |
| commit | feee9e57abcb139f455e4e0043fe94365af3b1fd (patch) | |
| tree | 3a1647c77205d150f8084a15bc65dd4299a0cb17 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 374b34dcc99aaddac547fe2562630b127c397c89 (diff) | |
| parent | a8e18c81528fce0041deb3419a26a9c438c0a03b (diff) | |
am a8e18c81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'a8e18c81528fce0041deb3419a26a9c438c0a03b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions