OSDN Git Service

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

Change-Id: I1a2d6910367f2a5acd61e139034fabd074d2f0b9


Trivial merge