OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: d94bd8e917
authorElliott Hughes <enh@google.com>
Fri, 12 May 2017 02:33:23 +0000 (02:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 May 2017 02:33:23 +0000 (02:33 +0000)
am: db6c38177a

Change-Id: Icec86477f8ea713f6d1044ac3c71081a69c3b42c


Trivial merge