diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:30:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:30:36 +0000 |
| commit | 584e10e143334188c506b5e364da85d4c0051140 (patch) | |
| tree | a9fc73af3653bb3c5db78ef929feee32acef5592 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | eb1ed80a8962d899049c20bb551b9f57d64534ff (diff) | |
| parent | 9bee6f1a2769c72e35ba7256b4f1955a3555b515 (diff) | |
am 9bee6f1a: (-s ours) am 7ff74826: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '9bee6f1a2769c72e35ba7256b4f1955a3555b515':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions