OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Thu, 25 Jan 2018 15:50:37 +0000 (15:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 15:50:37 +0000 (15:50 +0000)
am: e77711bf80

Change-Id: Ia7b278c6f96e2a75cbbadd21366f6732e802c2cf


Trivial merge