tree 5c9a264c9f53519f428fd462916b3694c16fa048
parent bc01819b673a7eb7b59ae60e8a56fd9f1f0dab52
parent dc937ecdbd30ab361d98ad2f8f7c8c1a98e1966b
author Treehugger Robot <treehugger-gerrit@google.com> 1603717029 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603717029 +0000

Merge "Add shared jarjar rule for tethering tests" am: 29dc671218 am: 2dc283eeca am: dc937ecdbd

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

Change-Id: Ie1e828e976b798c65df688b2ce43f60fc07d633b