OSDN Git Service

Merge remote-tracking branch \\'toybox/master\\' into HEAD am: 5bb7e2581e
authorElliott Hughes <enh@google.com>
Mon, 11 Jul 2016 20:49:19 +0000 (20:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jul 2016 20:49:19 +0000 (20:49 +0000)
am: 85abb28ade

Change-Id: Ie0e297f5595dd7dfbd78487b32dae44e86d58762


Trivial merge