diff options
| author | Baligh Uddin <baligh@google.com> | 2014-04-04 14:37:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-04 14:37:23 +0000 |
| commit | c71d89a8268cdc445b1b07e9f5a97372f8593629 (patch) | |
| tree | 915a1df70197f122c5fcfce34097dd39490ed401 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e0628134ab8c5f997d43cc6d8ed79fdea5e815f6 (diff) | |
| parent | ab0c43a4581d5b34ea9590cad4495447aa536942 (diff) | |
am ab0c43a4: (-s ours) am 15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit 'ab0c43a4581d5b34ea9590cad4495447aa536942':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions