diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:43:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:43:06 +0000 |
| commit | 329c9de254511caca39a98dbf4f15797c9daf55e (patch) | |
| tree | 8c0a94d8a885ad9b7b94e415564beaab6cfe0af3 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 781f697aead59594d0f980c3b83bb65de2982ee4 (diff) | |
| parent | 12d21f10c69171c7f7a4a25c7f8c1ff07eac03fa (diff) | |
am 12d21f10: (-s ours) am faa4706f: (-s ours) am 1fc614f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '12d21f10c69171c7f7a4a25c7f8c1ff07eac03fa':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions