OSDN Git Service

am 088c8de2: (-s ours) am d14c4844: Merge "Pass connection configuration when setting...
authorMitchell Wills <mwills@google.com>
Thu, 27 Aug 2015 10:03:47 +0000 (10:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:03:47 +0000 (10:03 +0000)
* commit '088c8de233134294049129bc5a542d61a1740d5d':


Trivial merge