OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 19 Jun 2017 22:43:33 +0000 (22:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 22:43:33 +0000 (22:43 +0000)
am: f353b240a5

Change-Id: I06997a45f022ede7080ab0b163b8b0c018438cb4


Trivial merge