OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Fri, 22 Dec 2017 02:01:39 +0000 (02:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Dec 2017 02:01:39 +0000 (02:01 +0000)
am: 5c2683335f

Change-Id: Id1c5fa6a2253e8ff1c8d00c5eb553e813af89aff


Trivial merge