diff options
author | Xin Li <delphij@google.com> | 2020-04-08 06:30:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-08 06:30:50 +0000 |
commit | f97df6d300641c1908957e0e76b899b9ee7b30cd (patch) | |
tree | 5712026a248635d37e843a7be6c0d0056dea0158 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 9f8d61aa60f1d89b8bea396cbbe7f80860108b96 (diff) | |
parent | 9fd000bfece7d78113f9bcf5707c32e3d69bb29a (diff) |
[automerger skipped] Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" am: 9fd000bfec -s ours
am skip reason: Change-Id I9265f01ed2f6e4aca7728d278f06ceea5633dac5 with SHA-1 344858dd9c is in history
Change-Id: Iadc8bb3433c557333266526e51b306faf1c69cda
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions