OSDN Git Service

am 35c23212: (-s ours) am fd0e9f19: Properly handle outgoing connection requests...
authorAnubhav Gupta <anubhavg@codeaurora.org>
Thu, 27 Aug 2015 10:53:39 +0000 (10:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:53:39 +0000 (10:53 +0000)
* commit '35c23212a797bf67e8c41114a60ed4dca10c134c':


Trivial merge