OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 31 Jan 2017 22:58:26 +0000 (22:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Jan 2017 22:58:26 +0000 (22:58 +0000)
am: 22656c7f1a

Change-Id: Id08a743096f735747109a2a7631debdd85e72d21


Trivial merge