| commit | 0fac11a8ce4f8a5ea12ea899d4155cc797e4d7df | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Wed Jun 10 18:13:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 10 18:13:32 2015 +0000 |
| tree | 82e0c2c1a6cca29d65c9d213a0b31ce5267c86bd | |
| parent | b1eb5b8f69ccb25470dcbd14e7854840d67975b7 [diff] | |
| parent | c1e623bbcae1678f145106bb1838ee903ad00c6f [diff] |
am c1e623bb: Merge "Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs" into mnc-dev * commit 'c1e623bbcae1678f145106bb1838ee903ad00c6f': Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs