diff options
author | Hai Zhang <zhanghai@google.com> | 2019-08-01 15:22:54 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-01 15:22:54 -0700 |
commit | 8b2f02017299c6711a3856f6ffe87f74561ec2eb (patch) | |
tree | e5200c4c270b950a1abf9474f0cf646a2d80c8a8 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 9f79477e42b6b0943a9e3f12cb007ce3ed251b6b (diff) | |
parent | dbaecb159ca2832ee8af4fd459eacbd5fcc87135 (diff) |
[automerger skipped] Merge "Merge "DO NOT MERGE Fix migration for default browser." into qt-r1-dev am: 85773ee58c am: 09a909b080" into qt-qpr1-dev-plus-aosp
am: dbaecb159c -s ours
am skip reason: subject contains skip directive
Change-Id: I5a8ef29432a6b25abf6ba74592d39241fe53efff
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions