OSDN Git Service

Merge remote-tracking branch \\'toybox/master\\' into HEAD am: a126e5f9a2
authorElliott Hughes <enh@google.com>
Fri, 15 Jul 2016 18:30:41 +0000 (18:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 18:30:41 +0000 (18:30 +0000)
am: e51bec3b3b

Change-Id: I19233a9cd9e2e1d5a8b59961016f7ab0187c6750


Trivial merge