OSDN Git Service

am f5cef31b: (-s ours) am c96e4249: Don\'t add a symlink for killall --- it\'s broken.
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 10:50:00 +0000 (10:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:50:00 +0000 (10:50 +0000)
* commit 'f5cef31b49d40d27fbeea06438ca9668c7cf42ca':


Trivial merge