OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 28 Nov 2017 01:33:53 +0000 (01:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Nov 2017 01:33:53 +0000 (01:33 +0000)
am: 73fd808900

Change-Id: I32af02ae6ff58b9aa9160f7a58dad6b30c2e5c44


Trivial merge