diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 18:16:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 18:16:52 +0000 |
| commit | 5895aed0228882e0337d76e10e0152ccafa2535e (patch) | |
| tree | cd16f63e49e7e644433abd1c5ffd1c3a780bee73 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 98adccb5f901180c37efdeec44faa4faeada5031 (diff) | |
| parent | 2ab06bfe054178c708742376a6cadc0f49410a93 (diff) | |
am 2ab06bfe: (-s ours) am d88b1437: (-s ours) am 2f52c65c: (-s ours) am 39dc2f31: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '2ab06bfe054178c708742376a6cadc0f49410a93':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions