tree 2534e89b103d2b360b65234ed863614ca1b568eb
parent f81e0a1eafbc8add154a207efc148c7789d6b705
parent 64d43056ace73e9cc34b6bd2885185af2495633d
author Patrice Arruda <patricearruda@google.com> 1601422731 +0000
committer Patrice Arruda <patricearruda@google.com> 1601482583 +0000

resolve merge conflicts of 64d43056ace73e9cc34b6bd2885185af2495633d to rvc-dev

Test: I solemnly swear I tested this conflict resolution.
Bug: b/169423400
Change-Id: I9e4bf3784a1ba5ae49793dbf367347106b997461
Merged-In: I67b229fbf52e913b0c4f5e7932021132ddc0598f