OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Fri, 30 Dec 2016 01:29:58 +0000 (01:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Dec 2016 01:29:58 +0000 (01:29 +0000)
am: 0fcfdec760

Change-Id: I3e66aca67046626b765b37b8b185961afed8e1e5


Trivial merge