commit 6d18bd238b94a1f6af4c2e560654e9103c8e4d6f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 06 03:07:42 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 06 03:07:42 2020 +0000
tree 1026a08bb4c4dddb4cc1d42f4832a60062b7042e
parent cea309034ca317fd58eea512d593b11546a1c6e1
parent e491bfe7029a2c6fdd4a2690d5173ddc05401656

Merge changes from topic "am-c2cb4c0f3ab84530991868dc5fd89fe9" into rvc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "am-99b870448c8c43b2815c42861ac6235c-rvc-dev" into rvc-dev am: df554bb5f8 am: 47285473fe -s ours
  [automerger skipped] [SP18.5] Create offload controller poll interval to resource am: 2a5f21425a am: f887f54a5c -s ours
  [automerger skipped] [SP18.4] Add unit test for polling network stats in OffloadController am: 14722baf0d am: b6ab822c32 -s ours
  [automerger skipped] [SP18.3] Adapt TestableNetworkStatsProviderCbBinder am: b7011d2265 am: 8c23b65a4f -s ours