diff options
author | Baligh Uddin <baligh@google.com> | 2014-07-06 19:45:34 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-06 19:45:34 +0000 |
commit | 11281de7a2c335ed5410fa83b275173130714f52 (patch) | |
tree | 52ce1845696e788825e05127a459d7370e0efdfe /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | de9bfb799e99440888ecd911d60f42ff206c886c (diff) | |
parent | 89523569e4c1be2e102b5fb991023d6696384d76 (diff) |
am 89523569: (-s ours) am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '89523569e4c1be2e102b5fb991023d6696384d76':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions