diff options
author | Baligh Uddin <baligh@google.com> | 2014-07-06 18:39:28 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-06 18:39:28 +0000 |
commit | de9bfb799e99440888ecd911d60f42ff206c886c (patch) | |
tree | 52ce1845696e788825e05127a459d7370e0efdfe /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 9c9223d91eb57ba7f45532e551861696c55883ec (diff) | |
parent | 8e1bf9f1a38b70459ddcaeb816b83c3c83e8c9b8 (diff) |
am 8e1bf9f1: (-s ours) am 43ba3ba4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '8e1bf9f1a38b70459ddcaeb816b83c3c83e8c9b8':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions