OSDN Git Service

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

Change-Id: I3b81616c95ffb2300028733734dc3705ffc3a54d


Trivial merge