OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Sat, 10 Feb 2018 04:00:27 +0000 (04:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 10 Feb 2018 04:00:27 +0000 (04:00 +0000)
am: b5517d09b2

Change-Id: I6578e6446b411e93af01e8883dfb7fd02892493e


Trivial merge