OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: cb633d4175 am: cf77ae240a
authorElliott Hughes <enh@google.com>
Mon, 23 Oct 2017 16:05:37 +0000 (16:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Oct 2017 16:05:37 +0000 (16:05 +0000)
am: 0f36350092

Change-Id: I1c61311d2d3cb50b73c6cfbd57a2049f18784b86


Trivial merge