OSDN Git Service

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

Change-Id: I13cdaefcf3723508b4f0f8a09ff5e7cac287ceed


Trivial merge