OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 7c3d7b1386
authorElliott Hughes <enh@google.com>
Tue, 21 Feb 2017 17:54:59 +0000 (17:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Feb 2017 17:54:59 +0000 (17:54 +0000)
am: 4cf3273234

Change-Id: I228f044a87c86b6ff00b0adef1297e73b1a1d618


Trivial merge