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