tree f125284d7a89877a6426f1e021aee56e54c910dd
parent 24367cc06c1524ad1a17528daf571dc2629bd773
parent 0f8964439a0d2c2150d58c44c500c409c895a3ed
author Treehugger Robot <treehugger-gerrit@google.com> 1620977184 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620977184 +0000

[automerger skipped] Merge "Move connectivity sources to packages/Connectivity" am: b249b941ee am: 3eea8f3546 am: 0f8964439a -s ours

am skip reason: Merged-In I26d1a274058fa38763ad4f605549d880865b4d76 with SHA-1 9bf30999cc is already in history

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

Change-Id: Idf91bcf36f6e79ab7f5c91d9939a3b7f742d73dd