diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-08 02:28:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 02:28:21 +0000 |
| commit | c7b893de5a5402a54e1a207c62b4ea09584dc30e (patch) | |
| tree | 5273467051b3ef9bc60428e96cdef0b414f9cbdb /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 9ca926adbb5c3503300bdd52266daf503e14113a (diff) | |
| parent | 12b2abe21daf5b7fb78414dd5d884bd2f723b46b (diff) | |
am 12b2abe2: (-s ours) am 9a8db293: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '12b2abe21daf5b7fb78414dd5d884bd2f723b46b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions