OSDN Git Service

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

Change-Id: I85e6fee0cf60c1daf18ea022c827f40dfb19faea


Trivial merge