OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 64279d4042
authorElliott Hughes <enh@google.com>
Mon, 17 Apr 2017 21:42:11 +0000 (21:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Apr 2017 21:42:11 +0000 (21:42 +0000)
am: 0c31248456

Change-Id: I8ed7409d13f101a209b0d3007c4d9100a96927b6


Trivial merge