OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: af478b798e am: 8060e56a63
authorElliott Hughes <enh@google.com>
Mon, 22 Jan 2018 21:44:11 +0000 (21:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Jan 2018 21:44:11 +0000 (21:44 +0000)
am: 3c9362b1a0

Change-Id: I763ec8dad8994c5e80e7e44d5c408060b32c08a8


Trivial merge