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