tree ed354069bbf353ede50fa786fa72ee2dbcc93764
parent ea6bb2818a5389c79c78b62a70e672c909e0a852
parent d8e3f8264b3b60876a6bed059bfad1961544c14f
author bohu <bohu@google.com> 1489768722 +0000
committer android-build-merger <android-build-merger@google.com> 1489768722 +0000

Merge "Emulator: enhance logcat -Q to handle qemu pipe device" am: a14b5bbd2c am: 1284bbbb52
am: d8e3f8264b

Change-Id: I5f7db638441e4760e80c9d42f70d19e987e0302a