OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 4 Dec 2017 20:48:15 +0000 (20:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Dec 2017 20:48:15 +0000 (20:48 +0000)
am: b4d75fdc5e

Change-Id: Ie14854bfa3c1a616f16382dd7a7c0578ab04fa08


Trivial merge