OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: ccb4be08fa
authorElliott Hughes <enh@google.com>
Fri, 18 Nov 2016 23:25:24 +0000 (23:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 Nov 2016 23:25:24 +0000 (23:25 +0000)
am: cda243a505

Change-Id: Iff1c778e90368bdda4372d40d3094d0a50ef5685


Trivial merge