diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 03:07:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 03:07:16 +0000 |
| commit | 3eb0ccbde558f9fccbc3c880fa00a9579ffdaa04 (patch) | |
| tree | e4b097e9d0a3e8adb2c93d006c582d8e1c7a7722 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | d542fb052e939b6f1510debef5f8e5cc60dd21df (diff) | |
| parent | 684a63f169ec3f34aa23e0b47df1158e1d230bcd (diff) | |
am 684a63f1: (-s ours) am 18b2419d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '684a63f169ec3f34aa23e0b47df1158e1d230bcd':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions