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