OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 13 Feb 2018 06:59:41 +0000 (06:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Feb 2018 06:59:41 +0000 (06:59 +0000)
am: 9d0d755783

Change-Id: I5a66e9d66758a3272e5dac219dc563f7ffc6968a


Trivial merge