OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 52a5544db4
authorElliott Hughes <enh@google.com>
Mon, 24 Apr 2017 19:10:10 +0000 (19:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 24 Apr 2017 19:10:10 +0000 (19:10 +0000)
am: 8a1f704d21

Change-Id: Ie580114779511c8ce6f49c26f2172d54e9fb7092


Trivial merge