OSDN Git Service

am 585b53e6: am 0325a858: Merge "[Settings] Wifi Setup responds to other connection...
authorLucky Zhang <luckyzh@google.com>
Wed, 14 Jan 2015 12:06:43 +0000 (12:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Jan 2015 12:06:43 +0000 (12:06 +0000)
* commit '585b53e6d2ddc0725ce69f6f7208ad791e8d256e':
  [Settings] Wifi Setup responds to other connection state change


Trivial merge