tree 3340f0682e0ce51a8627c516f0451558e25a0eab
parent 05e00902aa2327b5611c12390890b900b0bd047c
parent ac7a897a82da95f501b24796db1d86a623ad2212
author TreeHugger Robot <treehugger-gerrit@google.com> 1593591270 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593591270 +0000

Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: ac7a897a82

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

Change-Id: Ie42e4eeca56b5d4c1b1d087343ab5cadbd8130e4