OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Sat, 22 Oct 2016 18:02:19 +0000 (18:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Oct 2016 18:02:19 +0000 (18:02 +0000)
am: fb3ebf8f5d

Change-Id: Ic5e554bd996172c794299b2626dff10af65c7793


Trivial merge