diff options
| author | Baligh Uddin <baligh@google.com> | 2013-10-11 08:26:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 08:26:23 -0700 |
| commit | 2c63cd0a1217cdc93f2a7ebbae539ebcb34be2ac (patch) | |
| tree | 93c055f3b0526757d0b9db43d242bc9401126f30 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fd050e32c5a7a2f3669542f4c64b0fad8b4efc4d (diff) | |
| parent | 16212a971c170acd38f1b750dc7058a782d31cc9 (diff) | |
am 16212a97: (-s ours) am 0066a866: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '16212a971c170acd38f1b750dc7058a782d31cc9':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions