OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: acd101ac63
authorElliott Hughes <enh@google.com>
Mon, 12 Sep 2016 20:19:47 +0000 (20:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Sep 2016 20:19:47 +0000 (20:19 +0000)
am: b11a72dc2d

Change-Id: I9b8e0b90f802ff20958da7b00d1ec388baa0f864


Trivial merge