tree b61a961ae2911d768a9c7fd039c7e42bcdd506a3
parent c34288be586028f949686e9a4fe7b84207bf2a6d
parent f0affc6d46849e844bec9ddc755ffae0042e443f
author Yorke Lee <yorkelee@google.com> 1438825385 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438825385 +0000

am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev

* commit 'f0affc6d46849e844bec9ddc755ffae0042e443f':
  Correctly hide setConnectionService