tree a750f504d71992f1f0d81f4db5e26ea125592d5c
parent 59d1b4715764a72184298e1c907ba2b3be5bb5a3
parent cef482f830a787f249e7719ffb7d45db19ba1feb
author Dmitry Shmidt <dimitrysh@google.com> 1346803497 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346803497 -0700

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

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