tree 2314e92527553ced4b2391735743ac5b116c1865
parent afc0aa78f4a513ab3fddd01a3fb6a03a401801cb
parent 935d60080035eb7b2a2e0c0c8b3abaa221436ccd
author Jerry Zhang <zhangjerry@google.com> 1493341814 +0000
committer android-build-merger <android-build-merger@google.com> 1493341814 +0000

Merge "Revert "adb: Lower EP_ALLOC retry count"" am: 169590c47f
am: 935d600800

Change-Id: Id778046511d33f5eb75d533da644b54cbe49fef1