tree eb0b1dd9f2bc5b7db8452629d8148fb05430466c
parent e6e71608bd60b4745b048ec466b5ea1301020b32
parent 3e7feda3c52864055b6f6cc640e746bbc5282932
author Dan Albert <danalbert@google.com> 1438275892 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1438275892 +0000

Merge "adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL"