tree 5c610f8de1b0b9cfe4b325851a0e65a1f1ae53b7
parent 8f776df19c61ae9c074c6c06d0df3a5c19daf54a
parent 690edd3a9282710121d1e1e2ffb84b9b8e97adde
author Wink Saville <wink@google.com> 1378484732 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378484732 -0700

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

* commit '690edd3a9282710121d1e1e2ffb84b9b8e97adde':
  Do not change NetworkInfo.DetailedState.