tree 80a60954fc4a10600b4bb1979d76b86119d99d7f
parent 0797d796ce0be6786c80b71917380dec1518737d
parent 5759c2352a7e9ac31959360671696e0db81dee3b
author Chiachang Wang <chiachangwang@google.com> 1601014773 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601014773 +0000

Merge "Remove CONNECTIVITY_ACTION and INET_CONDITION_ACTION" am: 50d1eb59a4 am: 8f834c68bf am: 75b719adf1 am: 5759c2352a

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

Change-Id: Id9c2558abc74947c124c6d14f0864530f26d62f5