OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 2 Oct 2017 16:59:30 +0000 (16:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Oct 2017 16:59:30 +0000 (16:59 +0000)
am: 89bb822f3e

Change-Id: I0ba2a80d0d3a593ba89359fd6cc4f8d3c609ee1e


Trivial merge