OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Sat, 4 Nov 2017 07:30:58 +0000 (07:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 4 Nov 2017 07:30:58 +0000 (07:30 +0000)
am: 62f36d9160

Change-Id: If03981a937fed75efa974b00c8cf5ed0fcc5fbce


Trivial merge