OSDN Git Service

am b2fc085f: (-s ours) am 21331c62: Store the link key derived from cross tranport...
authorSrinu Jella <sjella@codeaurora.org>
Thu, 27 Aug 2015 10:54:50 +0000 (10:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:54:50 +0000 (10:54 +0000)
* commit 'b2fc085f97092557226016d5c9eba2b77c3d40dd':


Trivial merge