OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 4be718d62e
authorElliott Hughes <enh@google.com>
Sat, 12 Nov 2016 02:25:36 +0000 (02:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 12 Nov 2016 02:25:36 +0000 (02:25 +0000)
commit108c1104270a00dbbdf924dbf3ea1f3027f73ea5
treedd81217bab65cb0ac4f107732838b8628a73d164
parent079cc30a4c09c20398d9ceb81049c38a7c00243b
parentc3095b883fe131d61c50c5808eca00b505ef7b70
Merge remote-tracking branch 'toybox/master' into HEAD am: 4be718d62e
am: c3095b883f

Change-Id: I939c7a1c7a43ad5b692ab084ee5a55a702e2540a