OSDN Git Service

Merge remote-tracking branch \\\'toybox/master\\\' into HEAD am: 5bb7e2581e am: 85abb...
authorElliott Hughes <enh@google.com>
Mon, 11 Jul 2016 20:51:48 +0000 (20:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jul 2016 20:51:48 +0000 (20:51 +0000)
am: 3a4d91e0b5

Change-Id: I80910a8cf1356e48771d3c62cd9eceb91e1804f3


Trivial merge