OSDN Git Service

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

Change-Id: Id8859331e4fdd297253a4cd152827cd86e24f7fc


Trivial merge