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