tree 3db995e8b3ef20f047b40bd34ef52481c1f53729
parent d06c0ea844d816f80891caff31d6fc5a3b1fceb0
author Navtej Singh Mann <navtejsingh@google.com> 1441217654 -0700
committer The Android Automerger <android-build@google.com> 1441227916 -0700

manual merge for N5 FW(6.37.32.RC23.34.40)

1. Fix roaming failure prevents entering PS mode
BUG=23218044
From: https://partner-android-review.googlesource.com/#/c/376862/

Change-Id: Ifd1d5396fb6bebcb3796ad1f7432de9969571afe