OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 4ab83f6960 am: f3cea5c2a8
authorElliott Hughes <enh@google.com>
Tue, 21 Feb 2017 19:38:44 +0000 (19:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Feb 2017 19:38:44 +0000 (19:38 +0000)
am: ca45906d42

Change-Id: Iacb2370ee07d1d4f52fd6c38e50ca9f991a9b858


Trivial merge