OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 22 Aug 2016 21:09:06 +0000 (21:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Aug 2016 21:09:06 +0000 (21:09 +0000)
am: a0637cef8f

Change-Id: Iff9bf69c0fcb29aa6ba317be0e59481437f1a729


Trivial merge