diff options
| author | Baligh Uddin <baligh@google.com> | 2014-02-20 18:03:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 18:03:07 +0000 |
| commit | 5da96060e61c3076d0a5cbd87a3f17254414afeb (patch) | |
| tree | 1c7669753ee3355ffc7a699a225cf5afda97794c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8b297fb6ef42650a1126287aa0b610aa9a503167 (diff) | |
| parent | f887a67dbd1fd22c16cadc58b8f23bfd4eeba4ef (diff) | |
am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'f887a67dbd1fd22c16cadc58b8f23bfd4eeba4ef':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions