tree f5dc11d597c8984914d1ad2b385a6b8233bbf49c
parent a13697f68dc01db9c54481b4a6dbcf42711fa052
parent a83ce3451d76833ffba8d82c65890881d65db2b0
author Robert Greenwalt <rgreenwalt@google.com> 1402612267 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402612267 +0000

am 2d0ab42b: Merge "Apply API Council comments to ConnectivityManager" into lmp-preview-dev

* commit '2d0ab42b1420db884d26fd2ef22710b5a887e9a6':
  Apply API Council comments to ConnectivityManager