diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-14 16:50:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 16:50:48 +0000 |
| commit | fe249555726b5fcd000fb75a5dd289e13288f2f8 (patch) | |
| tree | 3a5d7eee22e5c280dad8258b326af77c8428144e /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 949d16ebd5f4902db8fe79970479fcb1bee4a524 (diff) | |
| parent | 703be9f6ffb962a9b11f0755cae41f7818989c81 (diff) | |
am 703be9f6: (-s ours) am bd16cb67: (-s ours) am b48de758: (-s ours) am d64aa493: (-s ours) am c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '703be9f6ffb962a9b11f0755cae41f7818989c81':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions