tree f216221affe35a8dc792d83ac2cb6f2fbe98fcc6
parent 6fabe93b731cd76d9ca78a756eec0bfa96e068aa
parent 3cea47c7819f009f23aeb0a96893fe837bff183b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582153785 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582153785 +0000

[automerger skipped] Merge "Fix usage of annotations in TetheringLib" am: 91bb789c20 am: a4dbd9a897 am: 3cea47c781 -s ours
am skip reason: Change-Id I1fae97a1c1e0ba07fa3e2d64cde7650cd26d0acd with SHA-1 eb22daaf5b is in history

Change-Id: Ifdfeae4e43afd3892ced4964d54e532a1f46e8fc