OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD
authorRob Landley <rob@landley.net>
Mon, 18 Jul 2016 03:59:44 +0000 (03:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Jul 2016 03:59:44 +0000 (03:59 +0000)
am: 650711a6c9

Change-Id: I757625cd0ec82d482fe4afe474e4865ecf713548


Trivial merge