tree 91ef19d6df0ae69995d1ae36cc0a24c0289eb7d2
parent 396da07e7992f8a5877162d40ba02dd0e0987fc4
parent 872d264c0a19ea0db078509edb17bd125ff5449d
author Robert Greenwalt <rgreenwalt@google.com> 1438116221 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438116221 +0000

am 872d264c: am d6162cf2: am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev

* commit '872d264c0a19ea0db078509edb17bd125ff5449d':
  Un-remove legacy ConnectivityManager API.