tree b1b6dc5d3fe987d8b86dc8d56f4e723764049965
parent 11f81780b850c58ae759f23f4b3dcbc107857d8e
parent 272e7a68f85706a631b209998ba5c4aeb69ca403
author Jerry Zhang <zhangjerry@google.com> 1493341693 +0000
committer android-build-merger <android-build-merger@google.com> 1493341693 +0000

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

Change-Id: Ia31c905eab9cb5c1c51a951896a8d1ed17978927