diff options
| author | Yue, VincentX <vincentx.yue@intel.com> | 2017-12-18 13:24:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-18 13:24:22 +0000 |
| commit | 93da99364ab1d2085c8beaac44b341c3bf347865 (patch) | |
| tree | 2c1f69bf7d29837879fa1c47ed2727de2412333f /annotations/generate_annotated_java_files.py | |
| parent | d7ad9bbce2563a59b8c19ee6b7d89d40f618b0d2 (diff) | |
| parent | cf80fdd066b8b2e7b3e8e339bd6669fd80c7daf0 (diff) | |
Merge "Porting from http://r.android.com/453156 to fix DatagramSocketTest#test_getRemoteSocketAddress" into marshmallow-cts-dev am: c1db58bc94 am: 236c07dfbd am: b9ea2fd3cc am: 7d90697304 am: 959235067e -s ours am: 7e5b36c85c -s ours am: 648b779e85 -s ours am: 7987794c59 -s ours am: 929e12afe9 -s ours
am: cf80fdd066 -s ours
Change-Id: I6347a02540fefe9e7cc8f401e96c1f65df69aef9
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions