OSDN Git Service

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

Change-Id: I2034eee62a46862ae2c1a204787af537c17ee438


Trivial merge