OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: f2fa082e9f am: f291c6ce19
authorElliott Hughes <enh@google.com>
Tue, 13 Dec 2016 05:14:06 +0000 (05:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 05:14:06 +0000 (05:14 +0000)
am: 5817c41cd2

Change-Id: Ifd7042c0a62932c02babee958007ee28ec044cd6


Trivial merge