diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 16:01:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 16:01:30 +0000 |
| commit | e7a2793fbf2cb4ff1258d5bba639873b8e69543e (patch) | |
| tree | 933afff8eeb2b66569e41799e504e413ed0e0f11 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4de8b6818996d155501edcdc930a1652925e14b0 (diff) | |
| parent | 781f697aead59594d0f980c3b83bb65de2982ee4 (diff) | |
am 781f697a: (-s ours) am 320c9617: (-s ours) am 501461e3: (-s ours) am 4dbca7f6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '781f697aead59594d0f980c3b83bb65de2982ee4':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions