OSDN Git Service

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

Change-Id: I039bf4df17ace5f19c5086f90f298ecfaa87adda


Trivial merge