diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-25 22:07:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-25 22:07:28 +0000 |
| commit | 4d4093aa1246a9b8b9143a6a86f5424e8d2141c1 (patch) | |
| tree | 13a85ed3fb707002090a3a523d1d6d69bbd50cea /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | db88184dce7ed0f6365c3aa33a7536d486f7d3f8 (diff) | |
| parent | 90a7cbba0e9b437d4dffc1e03b2d17669a31c1b1 (diff) | |
am 90a7cbba: (-s ours) am d6c7fd28: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '90a7cbba0e9b437d4dffc1e03b2d17669a31c1b1':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions