OSDN Git Service

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

Change-Id: I6b104c85a8884e5b2349c6765aed5bdf0937a016


Trivial merge