OSDN Git Service

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

Change-Id: I92ec837a6d62e5f495c0c772e688da022798f6ac


Trivial merge