diff options
| author | Yue, VincentX <vincentx.yue@intel.com> | 2017-12-18 13:26:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-18 13:26:56 +0000 |
| commit | d4f1eeae5c61de328cef26ae2b3f2f904a402064 (patch) | |
| tree | 2f1269e7002e1a818e0296674c04f5e2295ee1d4 /annotations/generate_annotated_java_files.py | |
| parent | ac4a26a7d7b1d4a365c99f3b1d2d65eecdc3e6ab (diff) | |
| parent | 93da99364ab1d2085c8beaac44b341c3bf347865 (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
am: 93da99364a -s ours
Change-Id: I1c5b4349d4c6b14a7aa27316a85a60ab7840cc60
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions