diff options
| author | Neil Fuller <nfuller@google.com> | 2015-09-01 09:14:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 09:14:46 +0000 |
| commit | 381d70a8dca1e1ba3ea1422e1759da148913c8d0 (patch) | |
| tree | dca7303d54b9b04d92219fb3012f0399953456c8 /annotations/generate_annotated_java_files.py | |
| parent | e643681966cc64a0329848daf164b15ad2dd0f44 (diff) | |
| parent | 27ef0eb26e179b7750b9cb72018da9fab3a0bbb0 (diff) | |
am 27ef0eb2: Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipop-cts-dev
* commit '27ef0eb26e179b7750b9cb72018da9fab3a0bbb0':
Fix for MulticastSocketTest for non-multicast interfaces
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions