diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-08 14:32:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 14:32:50 +0000 |
| commit | 6760080b5ec853f75d3775585de347429d23aee9 (patch) | |
| tree | 3f8252a226a2e048f2ae76c8652883fca71339a2 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 1fee49529e6310a2fc163f004e5f5299d006cb2f (diff) | |
| parent | f63da31f530ad43989f4269b22552df5ba3c15f7 (diff) | |
am f63da31f: (-s ours) am db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'f63da31f530ad43989f4269b22552df5ba3c15f7':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions