| commit | eb2f51d1ca7d84d55cecfbfbc41d5b1d9c62a69d | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Jul 14 22:50:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 22:50:40 2015 +0000 |
| tree | 69ae35af8499a636949856479d4115ca3e9855c6 | |
| parent | f097f1d12e6bdd08307a5ba845d4d7df5780b966 [diff] | |
| parent | 75cabb40dbc238f7a3445cd148808bfd343ce9a9 [diff] |
am 75cabb40: 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 '75cabb40dbc238f7a3445cd148808bfd343ce9a9': Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue