diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:43:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:43:01 +0000 |
| commit | 781f697aead59594d0f980c3b83bb65de2982ee4 (patch) | |
| tree | 8c0a94d8a885ad9b7b94e415564beaab6cfe0af3 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 2525bb26c12b38509694ea93c61be3c0fccde25c (diff) | |
| parent | 320c9617ac8ab327d10eb11ecfa64a20f7b019af (diff) | |
am 320c9617: (-s ours) am 501461e3: (-s ours) am 4dbca7f6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '320c9617ac8ab327d10eb11ecfa64a20f7b019af':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions