OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD
authorRob Landley <rob@landley.net>
Wed, 22 Jun 2016 18:26:09 +0000 (18:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 18:26:09 +0000 (18:26 +0000)
am: 0803f535c0

Change-Id: Ib0d8d4f3a27cf8c04e77ea0cadfaacee1f02c7ed


Trivial merge