OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: fe3d63b269 am: 21b59f15b6...
authorElliott Hughes <enh@google.com>
Fri, 2 Jun 2017 21:46:56 +0000 (21:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Jun 2017 21:46:56 +0000 (21:46 +0000)
am: f9429258b1

Change-Id: I6087ca2bcc333c093c4ea8d99bf95d918d0aeed8


Trivial merge