OSDN Git Service

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

Change-Id: I517a8ad1465bcc2a198e6000e32e41149d9b1050


Trivial merge