diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-15 22:45:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 22:45:49 +0000 |
| commit | c71670109681040c676895b1db962753db0414e9 (patch) | |
| tree | a4a82ef6ad1d4f9642c396b346b156449805dfcf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a2ab4fc82629f200d93fa77a29094ff3ecb86af3 (diff) | |
| parent | 9139d5b0fd3b523deb6fffe534fc07c462604483 (diff) | |
am 9139d5b0: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '9139d5b0fd3b523deb6fffe534fc07c462604483':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions