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