OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: e77711bf80
authorElliott Hughes <enh@google.com>
Thu, 25 Jan 2018 16:21:17 +0000 (16:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 16:21:17 +0000 (16:21 +0000)
am: ba229b4bff

Change-Id: Icb9e8e4fea3873aa764b1b329dbcb71da59cdc03


Trivial merge