OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: fe3d63b269
authorElliott Hughes <enh@google.com>
Fri, 2 Jun 2017 21:36:35 +0000 (21:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Jun 2017 21:36:35 +0000 (21:36 +0000)
am: 21b59f15b6

Change-Id: I8587fbaf631b789749f9f7d6ec30bbd309f3bad0


Trivial merge