tree f48bed420b337cec8dce0e01ab3b2ae4be27d64f
parent c5c02f1d8a39ff95f2a01e1cee7daf3c0ade6dbe
parent 0531f20404b2e284d1b444d5af48b6e0c629975b
author Dmitry Shmidt <dimitrysh@google.com> 1346803372 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346803372 -0700

am 0531f204: Fix \'restore STA reconnection behavior\' cherry-pick

* commit '0531f20404b2e284d1b444d5af48b6e0c629975b':
  Fix 'restore STA reconnection behavior' cherry-pick