commit b012d872de4e63f757e5e1637f03de049ab46e87
author Atanas Kirilov <akirilov@google.com> Tue Apr 10 22:50:30 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 10 22:50:30 2018 +0000
tree 977c78b369abfb587d11c7e4ca61ae38fd5c4e6c
parent 6aef93377d89f5e2a52866033fb39e1b76557fd5
parent 60eaf799d0250866d7ada53bee96cfa780b2ff29

Merge changes from topic "am-35cf956b-e4b9-4d71-8e67-b3f3e90a9e22" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: 38598d8d32 am: 8e4b6ba3c3 am: 5a9d8f6c08 am: 54035f7af6 skipped: 8a641322d9
  [automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: 38598d8d32 am: 8e4b6ba3c3 am: 5a9d8f6c08 am: 54035f7af6
  [automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: 38598d8d32 am: 8e4b6ba3c3 am: 5a9d8f6c08
  [automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: 38598d8d32 am: 8e4b6ba3c3
  [automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: 38598d8d32
  RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks