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:20:36 +0000 (05:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 05:20:36 +0000 (05:20 +0000)
am: 15e4f3437b

Change-Id: Idc5dc25b7865a7c9a5b36434555458e8292eee6c


Trivial merge