OSDN Git Service

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

Change-Id: I6865c79f91ddf25add64638c57e10e68129885eb


Trivial merge