diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-08 15:00:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 15:00:11 +0000 |
| commit | ec4af4d6ebcbd72f5dea1793788bb51d45d0998e (patch) | |
| tree | f068505d122a420ecd1af2ed8bfe9c22fdbda263 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 5a9102e307f395dec106cd5e0109abf9b0e07d5b (diff) | |
| parent | cb1486d0fa703866c29d11872588215259e819fd (diff) | |
am cb1486d0: (-s ours) am 1fee4952: (-s ours) am 1e9b3cff: (-s ours) am 18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'cb1486d0fa703866c29d11872588215259e819fd':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
