OSDN Git Service

am 9ee1ea15: (-s ours) am c6760d82: Provide --android-ipc-socket-suffix.
authorIan Coolidge <icoolidge@google.com>
Thu, 27 Aug 2015 10:55:19 +0000 (10:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:55:19 +0000 (10:55 +0000)
* commit '9ee1ea1522064b8a085b1d2b570e273992c88ed4':


Trivial merge