OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 60f116b00b
authorElliott Hughes <enh@google.com>
Wed, 1 Nov 2017 21:45:48 +0000 (21:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Nov 2017 21:45:48 +0000 (21:45 +0000)
am: fb20928d25

Change-Id: Ia5504f0cc2d353cb8cb55fc00ba48b601d1e6b2e


Trivial merge