OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 22 Jan 2018 21:34:08 +0000 (21:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Jan 2018 21:34:08 +0000 (21:34 +0000)
am: af478b798e

Change-Id: I945d01ec1091497310ab945024a2b7c56f90fede


Trivial merge