diff options
| author | Baligh Uddin <baligh@google.com> | 2014-06-07 12:33:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-07 12:33:53 +0000 |
| commit | 60c78f58ab7a3f78e409f3cb4570ab217f07f51a (patch) | |
| tree | a1fea658839598021eed89bce5fb0ed3b0a36078 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2c0b9cf758bb4918d36806b19450c1dc031a4816 (diff) | |
| parent | ceb997bae0a93e7844276f2c8566951a8c7b1105 (diff) | |
am 7c12fff1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
* commit '7c12fff112cf0bd09022bf2e87f721fc4c8526f3':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions