Commit ec385e3d authored by Roland Levillain's avatar Roland Levillain Committed by android-build-merger
Browse files

Merge "Avoid conflicts between default JDWP sync port and transport address."... 

Merge "Avoid conflicts between default JDWP sync port and transport address." am: 08ff0bc4 am: 7d4b59e4 am: 211b5c77
am: 65f8d937

* commit '65f8d937':
  Avoid conflicts between default JDWP sync port and transport address.

Change-Id: If9ca0be901c399f2ab312f78e7dfdbbec508648b
parents 987c786b 65f8d937
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment