OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Wed, 18 Oct 2017 23:22:07 +0000 (23:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Oct 2017 23:22:07 +0000 (23:22 +0000)
am: fa58895b44

Change-Id: I2d9a87c927142612d498e38a47f61cb3401842d9


Trivial merge