OSDN Git Service

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

Change-Id: Id8298b77e4d0c3402499dbfc079c7f228cab4034


Trivial merge