| commit | 470d17043a32058f989ba5832cb5f0875ad29859 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Jul 14 22:19:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 22:19:12 2015 +0000 |
| tree | e89d7118952ee18cf3d51786d5c3fc67e6efa142 | |
| parent | 0406d1503e08a3ba5308c0aede730f87305c3b64 [diff] | |
| parent | b2ff97c6589dd3d3c5e3da5f7c7a69b7a42fb317 [diff] |
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 'b2ff97c6589dd3d3c5e3da5f7c7a69b7a42fb317': Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue