OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Thu, 20 Oct 2016 00:16:55 +0000 (00:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Oct 2016 00:16:55 +0000 (00:16 +0000)
am: 5e9108a442

Change-Id: I836a48996548b7c2193f122e5ef1df13c76f36f7


Trivial merge