OSDN Git Service

Merge remote-tracking branch \\'toybox/master\\' into HEAD am: 650711a6c9
authorElliott Hughes <enh@google.com>
Mon, 18 Jul 2016 04:02:42 +0000 (04:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Jul 2016 04:02:42 +0000 (04:02 +0000)
am: db30f8e690

Change-Id: I863637857d04ee4466b6e0adee655344b765695f


Trivial merge