OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 11 Jul 2017 18:48:54 +0000 (18:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Jul 2017 18:48:54 +0000 (18:48 +0000)
am: b62e8ff3da

Change-Id: I2720c0aa0fce8d3afb854edaf4dd7b91ee48d8a9


Trivial merge