OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: a1ce46baab
authorElliott Hughes <enh@google.com>
Tue, 2 Aug 2016 17:32:27 +0000 (17:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 17:32:27 +0000 (17:32 +0000)
commit0f3ba9ca9ae39468c94d6a12af50f769045463d1
treefef457546c3c72bf6d10431b779c2fad4d089145
parentd8fe32653716c4f0e6857e94f115a90cb0507b04
parentda5a402a934a275385d77429c8966f9b6efc94ec
Merge remote-tracking branch 'toybox/master' into HEAD am: a1ce46baab
am: da5a402a93

Change-Id: I55d8d9b1865cd0968db132bbebef55cd39985c8a