diff options
| author | Neil Fuller <nfuller@google.com> | 2015-09-01 19:59:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 19:59:59 +0000 |
| commit | ed4dd365656e7702dd2e49185e2072d49f8d2cae (patch) | |
| tree | 4a38d981fef0682951f25a6cbb588105046dd40e /annotations/generate_annotated_java_files.py | |
| parent | ee02990dacb486155e30e03d4ca3aaaa9efdc9dd (diff) | |
| parent | 89fd4cad3970e4a2f0ef659b28e9ea974dbd8d34 (diff) | |
am 89fd4cad: am dbf66a12: am 5557c720: am 381d70a8: am 27ef0eb2: Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipop-cts-dev
* commit '89fd4cad3970e4a2f0ef659b28e9ea974dbd8d34':
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions