OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: d94bd8e917 am: db6c38177a...
authorElliott Hughes <enh@google.com>
Fri, 12 May 2017 07:24:07 +0000 (07:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 May 2017 07:24:07 +0000 (07:24 +0000)
am: 9ad4b73c95

Change-Id: Ic382b27a6cdc81157dcc6e0dee7a322b6f035109


Trivial merge