OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Thu, 15 Sep 2016 17:03:06 +0000 (17:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 17:03:06 +0000 (17:03 +0000)
am: d716ba6533

Change-Id: I429e855c09e75bea305fc94048f8e4c7b772b0a1


Trivial merge