tree 0c4844e14054066627deee6b6ce45db468ff4833
parent 1a23ef96895353973e5a79e635be9e18c8bda7d7
parent f6d68cfdc06ba4be4661afa0642eba8a54246608
author Mark Chien <markchien@google.com> 1593600333 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593600333 +0000

[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: 5ac18c5049 am: 13f66a7d24 -s ours am: 203c4f1978 -s ours am: 4fe609fa48 -s ours am: f6d68cfdc0 -s ours

am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 683932315b is in history

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

Change-Id: I3a0afe948361ac81206310a1e29832fc6cbf28b6