OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD
authorElliott Hughes <enh@google.com>
Fri, 8 Jul 2016 02:28:42 +0000 (02:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Jul 2016 02:28:42 +0000 (02:28 +0000)
commitb60425ea8ea5770a830141de5baffb714f96bfaf
treee333394084ed6ac8aec171e43b3cc53f8d96982e
parentae67d9bdb2ffb955427b19d7f785acf33aab4299
parente7b74ae6b0b92c28f9d0e025307636d0033a43b5
Merge remote-tracking branch \'toybox/master\' into HEAD
am: e7b74ae6b0

Change-Id: I2ed097db74aaacb5e98a44cfb116c676d54be803