OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 2 May 2017 22:00:53 +0000 (22:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 May 2017 22:00:53 +0000 (22:00 +0000)
am: c5a1dd459a

Change-Id: I4c5f54d1e302f5a783583249e111a3f64a6f39a5


Trivial merge