OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 2 Aug 2016 17:29:58 +0000 (17:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 17:29:58 +0000 (17:29 +0000)
am: a1ce46baab

Change-Id: I29e191c065fa740cd1f89909c6d3ff9e7640fbb2


Trivial merge