diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-15 22:27:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 22:27:44 +0000 |
| commit | ccec9777f4ec0ac7d1f50e5b2e0a881d86d12a8b (patch) | |
| tree | 317a366c1ef24ba5c396b812c2ebff7782ab31a6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f48b416e9806f374f95cfcfc35b60db82bb272a8 (diff) | |
| parent | 6e149a2537167f90b1db2430c19ccdf064548b91 (diff) | |
am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '6e149a2537167f90b1db2430c19ccdf064548b91':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions