diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-29 14:29:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 14:29:35 +0000 |
| commit | 32ceb174c615591a7fe5fd847da6156d29fa6472 (patch) | |
| tree | a2f1b476ca9393b5a583e65f9878893c41e6cb0c /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | d52aa500412c248946bb8fa3cc4f3f20f5c34e3b (diff) | |
| parent | b12e06a4df47c99b9fa3a1f28880477f175ab42e (diff) | |
am b12e06a4: (-s ours) am 57327c52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'b12e06a4df47c99b9fa3a1f28880477f175ab42e':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions