OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 7cfb1c6aab
authorElliott Hughes <enh@google.com>
Sun, 29 Jan 2017 21:03:14 +0000 (21:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 29 Jan 2017 21:03:14 +0000 (21:03 +0000)
am: b8ab605cff

Change-Id: Ief9a95c69136af126a2ba0393dc6e42898f23979


Trivial merge