OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: ddc2344ff9
authorElliott Hughes <enh@google.com>
Tue, 11 Apr 2017 20:19:58 +0000 (20:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 20:19:58 +0000 (20:19 +0000)
commit6825a904c1f3412caa5c518eac21edbaf792ca85
treeaf7bd022c8f8d56393aa33bd95eb7602113d7756
parente08da3253ca8e20c143bfafa06d2d900dc5969df
parente4c2dbe458a03e00bf481881aa95950c5a342500
Merge remote-tracking branch 'toybox/master' into HEAD am: ddc2344ff9
am: e4c2dbe458

Change-Id: Ica211d41cffecfeb39979df1c3aef8d4502c283e