OSDN Git Service

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

Change-Id: Iefe231e3c4ee9fe7ef72219959a039af5fcc4469


Trivial merge