tree 810baa14b8bc591a6cc32be2761c50620b35c594
parent c63ab77435d6a5979eefb4d68127002a263039fa
parent 3e3d4dc47082e7ee7a5de8e8b33326a0e7244622
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593592694 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593592694 +0000

Merge "Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: ac7a897a82 am: fa99bb4b35" into rvc-qpr-dev-plus-aosp am: 3e3d4dc470

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945

Change-Id: I4d59d30dd883b57d3be8ee79648549e0bccabc99