OSDN Git Service

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

Change-Id: I73052043f9c026fb47ae5c110f43e5075a30d2f3


Trivial merge