| commit | b2ff97c6589dd3d3c5e3da5f7c7a69b7a42fb317 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Jul 14 22:03:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 22:03:46 2015 +0000 |
| tree | fc9f945b83de10d33247342910041500f31936db | |
| parent | 1b8da7bab7ed6b13fe436532aab8b17f513c3e2e [diff] | |
| parent | 3c88311fb97ad77ff175b78322fdfaf63fc618e2 [diff] |
am 183662b8: am 3c88311f: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: 9feaaaf * commit '183662b8269c2f2b1b63a3791c663c46d14a3d90': Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue