OSDN Git Service

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

Change-Id: I817ed223ef8ba3b11116bec735efc19bbfcfd6c8


Trivial merge