OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: acd101ac63 am: b11a72dc2d
authorElliott Hughes <enh@google.com>
Mon, 12 Sep 2016 20:23:32 +0000 (20:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Sep 2016 20:23:32 +0000 (20:23 +0000)
am: 92163c0851

Change-Id: I77e8b94c47b83c1dca756cd285ec794dad5e4ac4


Trivial merge