tree 489deaa5d02d2f65c97a059cfc925fc6760c6b94
parent bc6ecbf7c259dd16d7b7fce794a32dc4c362a926
parent 860f528540836bf7853336d9eb0aeddf21ff591f
author Wink Saville <wink@google.com> 1378484239 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378484239 -0700

am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev

* commit '50f864480d6e9cf9e4d83b4533e3764753b4d408':
  Do not change NetworkInfo.DetailedState.