OSDN Git Service

am 289bfeae: (-s ours) am 4f6c9b4f: Use correct transport type while encrypting link
authorNitin Arora <niarora@codeaurora.org>
Thu, 27 Aug 2015 10:52:37 +0000 (10:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:52:37 +0000 (10:52 +0000)
* commit '289bfeae1303b3407a77b7c088a47672913d171a':


Trivial merge