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)
commit2f33c68fb0c76a69c2e3955a905084ef4575bd6a
treec75aea98264039b002376d91cb6ca8d22b95f65b
parent108c1104270a00dbbdf924dbf3ea1f3027f73ea5
parentcda243a5059fec4a5853455b3b4f1b4f0649ec89
Merge remote-tracking branch 'toybox/master' into HEAD am: ccb4be08fa
am: cda243a505

Change-Id: Iff1c778e90368bdda4372d40d3094d0a50ef5685