Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: 8a4065394b -s ours am: 5be8f14258 -s ours am: ec58302ece -s ours am: 9d6bb2d8c1 -s ours am: acec5e43cf -s ours

Browse Source

am: 42c4f98219 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I6d187ff5670880f0331748bae54b9dc726ad382e

...

This commit is contained in:

markchien

2019-08-26 19:47:23 -07:00

committed by android-build-merger

parent 111fe730e8 42c4f98219

commit b58a71b03c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available