tree 4f8d167c8ec5f127d94a318e5590b675da70c3a7
parent 27444657105e5e6d0aaa6c29311d657690c05ea7
parent 027e07d72d2a3c5cdffc8c93d332aede6e7a1843
author Paul Duffin <paulduffin@google.com> 1590680665 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1590680665 +0000

[automerger skipped] Merge "Switch framework-tethering to use java_sdk_library" am: b5bf211753 am: d65294b376 -s ours am: 027e07d72d -s ours

am skip reason: Change-Id Id1c2e848430c49a2da7402244814cd084f5da77c with SHA-1 cbac8e0b63 is in history

Change-Id: I39ea3325d903b1f3170e6304d83dcc3d257ea113