diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-08 15:00:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 15:00:21 +0000 |
| commit | 7516e28461ee25a8c720abaa1392147962d3bf79 (patch) | |
| tree | f068505d122a420ecd1af2ed8bfe9c22fdbda263 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | ec4af4d6ebcbd72f5dea1793788bb51d45d0998e (diff) | |
| parent | 6097f946d1e3bff27a49899027c1ad31a96518ef (diff) | |
am 6097f946: (-s ours) am 6760080b: (-s ours) am f63da31f: (-s ours) am db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '6097f946d1e3bff27a49899027c1ad31a96518ef':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions