OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 37852b74a7
authorElliott Hughes <enh@google.com>
Tue, 7 Feb 2017 17:01:51 +0000 (17:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Feb 2017 17:01:51 +0000 (17:01 +0000)
am: 6e78ae7824

Change-Id: I784367b02ebe929fa150a7da88facaa1ee7d013e


Trivial merge