OSDN Git Service

am 5e5ac5d8: (-s ours) am 54cea234: Merge "Boot loop when SSID has non UTF-8 characte...
authorxin He <xinhe@google.com>
Thu, 27 Aug 2015 10:00:02 +0000 (10:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:00:02 +0000 (10:00 +0000)
* commit '5e5ac5d8a1e79527ebbd7e7316316d7bf308b18e':


Trivial merge