diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:43:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:43:11 +0000 |
| commit | 0310775154f533d1b6b156ceabe610bd4c249d25 (patch) | |
| tree | 8c0a94d8a885ad9b7b94e415564beaab6cfe0af3 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 329c9de254511caca39a98dbf4f15797c9daf55e (diff) | |
| parent | 9cee0e777fa11f69d2e5e824057f79c5582fdea8 (diff) | |
am 9cee0e77: (-s ours) am ce5c1ac8: (-s ours) am f841432e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '9cee0e777fa11f69d2e5e824057f79c5582fdea8':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions