diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-13 17:19:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 17:19:14 +0000 |
| commit | 4c9ebc4c149627e4ea0ee82f053628021ef8bfe8 (patch) | |
| tree | 9d94c8158401655d2e1cd681f14d305d977b2ff2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cf2b65ce7a5a1d60755a00ae4da6cd6b1101af8c (diff) | |
| parent | c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274 (diff) | |
am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions