diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:42:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:42:56 +0000 |
| commit | 2525bb26c12b38509694ea93c61be3c0fccde25c (patch) | |
| tree | 8c0a94d8a885ad9b7b94e415564beaab6cfe0af3 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 7458493e55fc2c04332dcfe5824c4111adf41ebf (diff) | |
| parent | e82d25082bf4315fd166cf69dd03e6f2cf8b0d8a (diff) | |
am e82d2508: (-s ours) am 6df69ed3: (-s ours) am d7805ef7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'e82d25082bf4315fd166cf69dd03e6f2cf8b0d8a':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions