OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD
authorRob Landley <rob@landley.net>
Fri, 15 Jul 2016 18:27:42 +0000 (18:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 18:27:42 +0000 (18:27 +0000)
am: a126e5f9a2

Change-Id: If2c5d67842d506a82754b3af71d46be62569384b


Trivial merge