diff options
| author | Baligh Uddin <baligh@google.com> | 2014-07-06 18:28:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-06 18:28:54 +0000 |
| commit | b140440ea33ce512ba372deb11171ac688b1200b (patch) | |
| tree | 52ce1845696e788825e05127a459d7370e0efdfe /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 75a543193546525908c94981721a5d19f31fe285 (diff) | |
| parent | 6b7d2cf77d28922a8e81730e2a462aab258dfe68 (diff) | |
am 6b7d2cf7: (-s ours) am f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '6b7d2cf77d28922a8e81730e2a462aab258dfe68':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions