diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-08 14:43:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 14:43:16 +0000 |
| commit | bf78963c5d852387a8ee81393838012d439d4ce9 (patch) | |
| tree | 0f635324aed1783b7cde395d5a0eda0eb29e74df /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c61bd18d2b33ba12bedde61002b60086c2b0fd6b (diff) | |
| parent | 8eafcc164756869f6a8529cb6b5683483eb6639b (diff) | |
am 8eafcc16: (-s ours) am bf965352: (-s ours) am e53e421e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '8eafcc164756869f6a8529cb6b5683483eb6639b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions