OSDN Git Service

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

Change-Id: Ia77a8a3b293739cd97b7abe7c874325224b965d4


Trivial merge