diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-07-29 23:01:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 23:01:12 +0000 |
| commit | 6cdd52fd0c998a293a451ae5a81a46d170fe0a26 (patch) | |
| tree | 99872ae0284422ea2186617b2b3614e477ec2901 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | c685e0b2780cc6517863e47affcf7ff0ae02cf23 (diff) | |
| parent | d230fd8b798b655bc3266fb7c86af2291380ca34 (diff) | |
am d230fd8b: (-s ours) am 5d19d620: am 4799a9e0: am f8808db0: am 771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev
* commit 'd230fd8b798b655bc3266fb7c86af2291380ca34':
Revert "DO NOT MERGE Enhance local log."
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions