OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: fb3ebf8f5d
authorElliott Hughes <enh@google.com>
Sat, 22 Oct 2016 18:05:19 +0000 (18:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Oct 2016 18:05:19 +0000 (18:05 +0000)
am: 78585ef609

Change-Id: I12629dcffe8b0a84f87955a7c5b7138bae5a09fd


Trivial merge