diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 03:06:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 03:06:30 +0000 |
| commit | 3c25fc89fea8b794f9251a015351f048b2a796cd (patch) | |
| tree | e4b097e9d0a3e8adb2c93d006c582d8e1c7a7722 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | c488631ef09849b8c054cab26c463a2be260adf0 (diff) | |
| parent | 075a4c9c54566f3125b16bf652d9d2a2c67c6a8e (diff) | |
am 075a4c9c: (-s ours) am 6fad59a4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '075a4c9c54566f3125b16bf652d9d2a2c67c6a8e':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions