diff options
| author | Baligh Uddin <baligh@google.com> | 2014-05-22 03:17:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 03:17:17 +0000 |
| commit | 0c88b340acb699f125e3f2f8bdacc1409138a82d (patch) | |
| tree | b51ce37457ea5b5eae1fd57f33c6a0375ad4fe63 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2c2bbfb9c3d55eafe4711a7d02fb8d3a3531e247 (diff) | |
| parent | 15685632e0e62651ccfb6bfa2013afe715768126 (diff) | |
am 15685632: (-s ours) am adb0a906: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '15685632e0e62651ccfb6bfa2013afe715768126':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions