OSDN Git Service

Merge remote-tracking branch \\\'toybox/master\\\' into HEAD am: 73f8634ae0 am: ad9f9...
authorRob Landley <rob@landley.net>
Thu, 9 Jun 2016 15:56:48 +0000 (15:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Jun 2016 15:56:48 +0000 (15:56 +0000)
am: a8bd5bcbac

Change-Id: I129a4b7190a245c8407e29cc11d8b45979b48ab4


Trivial merge