diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 02:49:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 02:49:16 +0000 |
| commit | c488631ef09849b8c054cab26c463a2be260adf0 (patch) | |
| tree | e4b097e9d0a3e8adb2c93d006c582d8e1c7a7722 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | d159a208a4f1dbec522d8a0a5045a96fbe6d0082 (diff) | |
| parent | cbf24e129cb30bdac485e9e22c2c835f940df4bc (diff) | |
am cbf24e12: (-s ours) am 2deb87d4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'cbf24e129cb30bdac485e9e22c2c835f940df4bc':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions