OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 10 Oct 2016 21:59:36 +0000 (21:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Oct 2016 21:59:36 +0000 (21:59 +0000)
am: 64891a65fc

Change-Id: Iba8e51e0b6f1a02d2c80368c68d65dacf1029ea7


Trivial merge