OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 4be718d62e
authorElliott Hughes <enh@google.com>
Sat, 12 Nov 2016 02:25:36 +0000 (02:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 12 Nov 2016 02:25:36 +0000 (02:25 +0000)
am: c3095b883f

Change-Id: I939c7a1c7a43ad5b692ab084ee5a55a702e2540a


Trivial merge