OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: a379d5ee15 am: a4f4fa78eb...
authorElliott Hughes <enh@google.com>
Wed, 5 Jul 2017 19:55:56 +0000 (19:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 19:55:56 +0000 (19:55 +0000)
am: e1097aac54

Change-Id: Iff86c560c17b70f8bf1de96b42fa3224bc2e1c9e


Trivial merge