diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-22 14:03:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-22 14:03:58 +0000 |
| commit | 8d5ed661f060e3d915f3f1f593f2f87ebd1285cc (patch) | |
| tree | 417ef4cd00d18b4e02b8d1a7c556021d37a670dc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a88427c34729368766593fc2a8864b5383e907cc (diff) | |
| parent | 920e8be69db7cd24a9c5566b95686a6b714447e9 (diff) | |
am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '920e8be69db7cd24a9c5566b95686a6b714447e9':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions