| commit | 189904be01d2dcb209e1f6a5e5bc268cff9d40fd | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Wed Jul 15 00:00:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 00:00:21 2015 +0000 |
| tree | 69ae35af8499a636949856479d4115ca3e9855c6 | |
| parent | 9f80b1b93a6a03f698d5087d99f9033657d6d77d [diff] | |
| parent | 75cabb40dbc238f7a3445cd148808bfd343ce9a9 [diff] |
am 11fc5abf: am d619018e: am c92c2780: 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 '11fc5abfa4814ba3429965053821ae93566237c8': Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue