diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-05 08:00:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 08:00:12 -0800 |
| commit | 7f4cf0daeb7fa3311a05afe23c1615cba399242c (patch) | |
| tree | 858179056dcb0d807d989cc404b79109db91d542 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ed7d19e35cc4143af9e29bb09fc9f76ffe55c823 (diff) | |
| parent | 6a2ab88807039da56a1cfa710186b8bb425d2c8d (diff) | |
am 6a2ab888: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '6a2ab88807039da56a1cfa710186b8bb425d2c8d':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions