OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Fri, 2 Jun 2017 21:32:45 +0000 (21:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Jun 2017 21:32:45 +0000 (21:32 +0000)
am: fe3d63b269

Change-Id: I80107b04678e61d1fc356dc7e6efe1a875a7f7c9


Trivial merge