OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 29 Nov 2016 16:26:04 +0000 (16:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Nov 2016 16:26:04 +0000 (16:26 +0000)
am: d2ed825752

Change-Id: I8a6c0740b1be8d389004ab1f132ae255b021b7ad


Trivial merge