OSDN Git Service

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

Change-Id: Id25a633b4afab7ec8b99c12b0841f81e95b367f7


Trivial merge