OSDN Git Service

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

Change-Id: Icfa74ce051e6151fc206329884311e54adef8021


Trivial merge