Commit 61a590fa authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

[automerger skipped] Merge "org.apache.http.legacy is built with... 

[automerger skipped] Merge "org.apache.http.legacy is built with java_sdk_library" am: 897ecd2e am: a0ecbc9c  -s ours
am: 9a1b981b  -s ours

Change-Id: I0cd071db42f290b83d3d2ffecadcde6b996149d6
parents 9cc5f8b6 9a1b981b
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