commit d9feb6b31da75811445d550aa15dab822b2917b6
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 cebf134ef0a2884d12aa80470743e8cef4b7bd00
parent 5fa94643c72e60d1dd7e67fe19d84e100054d34e
parent bdac510e74c448a531b52c6e3e41f20ce997e5eb

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

* changes:
  [automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: 054fc6ff0e am: 1dfdb6d1e7 am: 6cbe9be06e am: 976dd7a9b7 skipped: 3af30ed269
  [automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: 054fc6ff0e am: 1dfdb6d1e7 am: 6cbe9be06e am: 976dd7a9b7
  [automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: 054fc6ff0e am: 1dfdb6d1e7 am: 6cbe9be06e
  [automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: 054fc6ff0e am: 1dfdb6d1e7
  [automerger] RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks am: 054fc6ff0e
  RESTRICT AUTOMERGE: WifiServiceImpl: fix and add tethering checks