OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Fri, 9 Feb 2018 18:49:08 +0000 (18:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Feb 2018 18:49:08 +0000 (18:49 +0000)
am: 4b13881492

Change-Id: I1e2d98073fcbb2b84ab3ccb3eef01f0fdd8c9a99


Trivial merge