OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: a0637cef8f
authorElliott Hughes <enh@google.com>
Mon, 22 Aug 2016 21:13:27 +0000 (21:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Aug 2016 21:13:27 +0000 (21:13 +0000)
commit5788fc59e64474ca3ebcb1aaabd03c4df14ee848
treebfcef40a6a7c4b54c636c5cf019e47ad8839b6bb
parent0f3ba9ca9ae39468c94d6a12af50f769045463d1
parente9452d6abed3389259420a18b4f62f77a60faa65
Merge remote-tracking branch 'toybox/master' into HEAD am: a0637cef8f
am: e9452d6abe

Change-Id: Iaf34a99429a545b90f241de39b6cea11cfac5275