diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-01 07:40:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-01 07:40:39 -0700 |
| commit | 1af0938e2f28bf6388a3e01bb7503cea02f47885 (patch) | |
| tree | d41472385ba4866350f0aa8e8f78c0ef6ac1f802 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6872435264f720dd5f1471d279f3f2ee938802e5 (diff) | |
| parent | 154abe1e7b66b1a09d62beefe7aab95820f028d1 (diff) | |
am 154abe1e: (-s ours) am 2bc2574e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '154abe1e7b66b1a09d62beefe7aab95820f028d1':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions