OSDN Git Service

Merge remote-tracking branch \\'toybox/master\\' into HEAD am: c0fec89dcf
authorElliott Hughes <enh@google.com>
Fri, 10 Jun 2016 16:55:40 +0000 (16:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Jun 2016 16:55:40 +0000 (16:55 +0000)
am: e389dc2bc4

Change-Id: I10b66f2ef5eaa4d3383e8a82d41d1f1ff10ac67a


Trivial merge