OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: f37062b46d
authorElliott Hughes <enh@google.com>
Thu, 14 Sep 2017 16:03:46 +0000 (16:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 16:03:46 +0000 (16:03 +0000)
am: a949b8829c

Change-Id: I2add91bb705fe680ddfe344118c4763d0d09bfd5


Trivial merge