diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 16:01:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 16:01:40 +0000 |
| commit | 7691b99c0dd5758b83e12b8101ce77e2f62769eb (patch) | |
| tree | 933afff8eeb2b66569e41799e504e413ed0e0f11 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e7a2793fbf2cb4ff1258d5bba639873b8e69543e (diff) | |
| parent | 329c9de254511caca39a98dbf4f15797c9daf55e (diff) | |
am 329c9de2: (-s ours) am 12d21f10: (-s ours) am faa4706f: (-s ours) am 1fc614f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '329c9de254511caca39a98dbf4f15797c9daf55e':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions