diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:10:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:10:58 +0000 |
| commit | 501461e31d7490ee690e357bcd6a9a9dabd208c2 (patch) | |
| tree | 00150c1f0a37179b532304998dbf8827467018df /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 6df69ed3baaac494bfb47e3ec8a737d6e10fcc8d (diff) | |
| parent | 4dbca7f6ca9ed0911dd28c43869c0d8d6b39db77 (diff) | |
am 4dbca7f6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '4dbca7f6ca9ed0911dd28c43869c0d8d6b39db77':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions