tree f5a099b744c4fbed62227931e564c1f786540c46
parent 1e00517d71603e9c2e2854bfbc7e3d99b78c4366
parent ddcc2324930c212196667efc3d9caf7b18454890
author Jerry Zhang <zhangjerry@google.com> 1493350469 +0000
committer android-build-merger <android-build-merger@google.com> 1493350469 +0000

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

Change-Id: I639db7fc5797ad2ce6dd6b3591284bd6822ab0f0