OSDN Git Service

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

Change-Id: I2120b3a09b81b1aa593b6bf2b8b7a5192d1b5738


Trivial merge