diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-29 14:47:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 14:47:45 +0000 |
| commit | d9e191a2606ba190630156e29b29ef0f0511e80c (patch) | |
| tree | 15d05cc8baacd8d571c05f2ea4e6811f16ce14fd /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 32764d0c455561c019ba6cbfe898b954d9621f23 (diff) | |
| parent | d8527c421ab79a009bd917cd4e401c083dc55181 (diff) | |
am d8527c42: (-s ours) am 07d6c197: (-s ours) am 7a66d847: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'd8527c421ab79a009bd917cd4e401c083dc55181':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions