OSDN Git Service

Merge remote-tracking branch \\\'toybox/master\\\' into HEAD am: e7b74ae6b0 am: b6042...
authorElliott Hughes <enh@google.com>
Fri, 8 Jul 2016 02:35:21 +0000 (02:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Jul 2016 02:35:21 +0000 (02:35 +0000)
am: 1a62894c8c

Change-Id: If7647dada2251d6365dd7710d382b4f3b7fdb38d


Trivial merge