tree 0fec9a452b38cb64137ea3df158983a3b8120803
parent 0a5a4e2548f21e35918b1ea8c35df2c1cb219660
parent 422c0ddfe6a84dbf37fb5e1b94135ff882121340
author TreeHugger Robot <treehugger-gerrit@google.com> 1593591273 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593591273 +0000

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

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

Change-Id: I0a6c2b29c04aa8105c8d1cf9075491d950912d29