OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Sat, 22 Oct 2016 18:02:19 +0000 (18:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Oct 2016 18:02:19 +0000 (18:02 +0000)
commit78585ef609c6bb74c9f7f8861c6bcdb4ac229ca6
treeabf59a44d7712f52e4ccf4752fb331fa743e544e
parente21288dd9b98ba5043cf6063b3383019238d36cb
parentfb3ebf8f5d9760cd7ee843c70fd2e503e7b51d95
Merge remote-tracking branch 'toybox/master' into HEAD
am: fb3ebf8f5d

Change-Id: Ic5e554bd996172c794299b2626dff10af65c7793