OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD
authorElliott Hughes <enh@google.com>
Fri, 8 Jul 2016 02:28:42 +0000 (02:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Jul 2016 02:28:42 +0000 (02:28 +0000)
am: e7b74ae6b0

Change-Id: I2ed097db74aaacb5e98a44cfb116c676d54be803


Trivial merge