OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Wed, 26 Oct 2016 17:00:35 +0000 (17:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Oct 2016 17:00:35 +0000 (17:00 +0000)
am: 991623dec1

Change-Id: I49da41b2808102bc9c0e4fb8250457968e3332e1


Trivial merge