diff options
| author | Baligh Uddin <baligh@google.com> | 2014-05-06 14:59:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-06 14:59:03 +0000 |
| commit | 594b9dcc1a4c3e3c554d71b32bab7dc61979a50d (patch) | |
| tree | ee956754d96029645d2c6ac3c68a03a1a1848e38 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dccbb6706bcdd8acbd263fc0f8495230114272b8 (diff) | |
| parent | ddaacaa7ceb6d41658eeea0079c9882510697dac (diff) | |
am ddaacaa7: (-s ours) am 37c954c0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'ddaacaa7ceb6d41658eeea0079c9882510697dac':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions