OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: d52431021f
authorElliott Hughes <enh@google.com>
Mon, 17 Apr 2017 17:10:57 +0000 (17:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Apr 2017 17:10:57 +0000 (17:10 +0000)
am: 3fad563468

Change-Id: I27bb20bcd1d406072a3dec94305dc6af3a69d10d


Trivial merge