Commit bb36ea24 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: 25d0ba6c am: 6dc564f1" into nyc-mr1-dev-plus-aosp
am: 17d586f5

* commit '17d586f5':

Change-Id: I19398921a8bccdba63e60cd622dd3cff2d7e33c3
parents 53da4b06 17d586f5
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