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)
commit195e7bf02627640f955ac4837b1af5170b7682f1
tree57d7a24436670d38b456c051f85d0bb3ad818b34
parent95049d0f7323a4a80b243f9e834f2b234d20d63a
parent45003a1ef825ce0fe63812c1ad049bccf1987026
Merge remote-tracking branch 'toybox/master' into HEAD am: 22656c7f1a
am: 45003a1ef8

Change-Id: I13cdaefcf3723508b4f0f8a09ff5e7cac287ceed