OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 0fcfdec760
authorElliott Hughes <enh@google.com>
Fri, 30 Dec 2016 01:37:27 +0000 (01:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Dec 2016 01:37:27 +0000 (01:37 +0000)
am: cfc9d622f1

Change-Id: Id770d6aa9e42894f0f24ab9b2eb005352f6934d8


Trivial merge