diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 18:16:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 18:16:59 +0000 |
| commit | 888bd0afb8a209c5373b8137493aa2f8ab93407a (patch) | |
| tree | cd16f63e49e7e644433abd1c5ffd1c3a780bee73 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 5895aed0228882e0337d76e10e0152ccafa2535e (diff) | |
| parent | 99854983bc8c57fb56cde595ccc0dba0ac30a6bf (diff) | |
am 99854983: (-s ours) am d542fb05: (-s ours) am 26d1a338: (-s ours) am 14d7a10a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '99854983bc8c57fb56cde595ccc0dba0ac30a6bf':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions