OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: bac04b4984 am: 3917661b78
authorElliott Hughes <enh@google.com>
Tue, 17 Oct 2017 20:23:19 +0000 (20:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Oct 2017 20:23:19 +0000 (20:23 +0000)
am: 80060a8309

Change-Id: I1c95d91113a23a50ed5f2ae6c84b3f5948765d7e


Trivial merge