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