diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-16 04:02:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-16 04:02:26 +0000 |
| commit | 144c0fe9b8dca2e3c77f5d312f23d1bc63eb9d8f (patch) | |
| tree | 298dcebf229b7d3a5284aee574a144ca11b4a4f0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f3f909d48ba46288e4c6f4f793438963656a1cdd (diff) | |
| parent | fc5f24d874e36d9e2bb73b21e6ed7fcac0e1d80c (diff) | |
am fc5f24d8: (-s ours) am db511f23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'fc5f24d874e36d9e2bb73b21e6ed7fcac0e1d80c':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions