OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 29 Aug 2016 16:04:24 +0000 (16:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 29 Aug 2016 16:04:24 +0000 (16:04 +0000)
am: 5d83f7a6f9

Change-Id: Ie338e8e67633f5b1ca4e022f8c41b1839e413449


Trivial merge