OSDN Git Service

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

Change-Id: Ie78a98ea6c99a1262dad73eb6795d8c6c20ae9f5


Trivial merge