Commit 65f8d937 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

* commit '211b5c77':
  Avoid conflicts between default JDWP sync port and transport address.

Change-Id: I15a40472a8b41b5d75d9c50c89bbe86c19ce71cc
parents 55aba568 211b5c77
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