diff options
| author | Geoff Mendal <mendal@google.com> | 2015-06-29 13:49:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-29 13:49:43 +0000 |
| commit | 6d8c62205a96cca8f6cafe0455df4396287f2130 (patch) | |
| tree | da11aae74b00a2b59f7ba3927fa5d1ca9eea7acf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 333847532f3fb6517daf9d41c8dbb0bca02d48a6 (diff) | |
| parent | 208daa1d76a65423c9d32b0b8414d13c419db7b1 (diff) | |
am 208daa1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '208daa1d76a65423c9d32b0b8414d13c419db7b1':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions