OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: a1ce46baab
authorElliott Hughes <enh@google.com>
Tue, 2 Aug 2016 17:32:27 +0000 (17:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 17:32:27 +0000 (17:32 +0000)
am: da5a402a93

Change-Id: I55d8d9b1865cd0968db132bbebef55cd39985c8a


Trivial merge