OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 5e9108a442
authorElliott Hughes <enh@google.com>
Thu, 20 Oct 2016 00:24:25 +0000 (00:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Oct 2016 00:24:25 +0000 (00:24 +0000)
commitbf847ea0ef80d56f0c271500b94ae0f536d2a412
tree1b27e5a85bad227d56011a3b61ae1d29ac4709f4
parent0c8c1eda213553c761fd6e6b4928ecb4d6770a6e
parente21288dd9b98ba5043cf6063b3383019238d36cb
Merge remote-tracking branch 'toybox/master' into HEAD am: 5e9108a442
am: e21288dd9b

Change-Id: I2f792ca97298eb796e325377fc67f57bc0a5eef3