OSDN Git Service

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

Change-Id: I0239cb6f76922638593fb471b8d53ca16c5279fb


Trivial merge