OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Fri, 24 Mar 2017 16:57:43 +0000 (16:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Mar 2017 16:57:43 +0000 (16:57 +0000)
am: f6e803dd5c

Change-Id: I77b0ed43d8309eadd39cf63ea4b4e5e23cb37fe0


Trivial merge