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