OSDN Git Service

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

Change-Id: Ie8954cd6ea1141878c4d9b5bd6ea4652d5933493


Trivial merge