OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Sat, 8 Apr 2017 02:24:30 +0000 (02:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 8 Apr 2017 02:24:30 +0000 (02:24 +0000)
am: 87edec9482

Change-Id: I4afed0610dae08ab3bc21529a4c104e87dba0d41


Trivial merge