OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 2 Aug 2016 17:29:58 +0000 (17:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 17:29:58 +0000 (17:29 +0000)
commitda5a402a934a275385d77429c8966f9b6efc94ec
treefef457546c3c72bf6d10431b779c2fad4d089145
parentdb30f8e690ec341cb2708f7360d2d6a1e8547785
parenta1ce46baabb7e91e01daccbe0bfaaff787200086
Merge remote-tracking branch 'toybox/master' into HEAD
am: a1ce46baab

Change-Id: I29e191c065fa740cd1f89909c6d3ff9e7640fbb2