OSDN Git Service

am 66bf9c42: (-s ours) am 26e08cb4: (-s ours) Reconcile with jb-mr0-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Sep 2012 23:43:46 +0000 (16:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Sep 2012 23:43:46 +0000 (16:43 -0700)
commitf32e0483cc44095d89b4cbf52def50207d3059a2
tree6fc39625a8255bed7e0823585091f0c64a196a9b
parenta7534b9cdb4f9c2b9ca56761119b0505626f03d6
parent66bf9c42970e42704a1618642662b9bc4997abfa
am 66bf9c42: (-s ours) am 26e08cb4: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '66bf9c42970e42704a1618642662b9bc4997abfa':
  Fix 'restore STA reconnection behavior' cherry-pick
  Restore STA reconnection behavior