| commit | 75cabb40dbc238f7a3445cd148808bfd343ce9a9 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Jul 14 22:33:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 22:33:58 2015 +0000 |
| tree | 1e4313e5d9678e7a62577db23ea3690075bb386e | |
| parent | 2ee5bd54a5c8901a9d8bd3508dc7ed82898b7d2c [diff] | |
| parent | 470d17043a32058f989ba5832cb5f0875ad29859 [diff] |
am 470d1704: am b2ff97c6: am 183662b8: am 3c88311f: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: 9feaaaf * commit '470d17043a32058f989ba5832cb5f0875ad29859': Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue