OSDN Git Service

Merge remote-tracking branch \\'toybox/master\\' into HEAD am: 06b90e3d57
authorElliott Hughes <enh@google.com>
Tue, 28 Jun 2016 22:48:32 +0000 (22:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 22:48:32 +0000 (22:48 +0000)
am: abe38f86d4

Change-Id: Iafe2de3258cc88ac460ceea353922e3c9384a049


Trivial merge