tree e708f776e19068b0b1caaadfc972c5d361f57ebc
parent a0de890405f7c354dd9c7d07f154d89d59a7c4dc
author Christopher Ferris <cferris@google.com> 1432175814 -0700
committer Christopher Ferris <cferris@google.com> 1432186458 -0700

Add a conditional removal of \r\n from adb output.

Bug: 21338668
(cherry picked from commit 8981aee6a9b92058943f22b26e0996859b07d7a3)

Change-Id: I590d2e76e06b6ba277d7554a119d5351afab1b3f