OSDN Git Service

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

Change-Id: Iaf34a99429a545b90f241de39b6cea11cfac5275


Trivial merge