| commit | 2ad00f0d756863d46335624739356847afa8c910 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Sat Sep 12 04:08:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 04:08:15 2015 +0000 |
| tree | 8b253b9e74743319aaca821e8a40fe854ec29fda | |
| parent | 83de3ad4eb661fe92aff8bac63b770bd183b0336 [diff] | |
| parent | 44cfb34a9b7d700242ce1c3caf288455407e5b5b [diff] |
am 44cfb34a: am fe88ec43: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev * commit '44cfb34a9b7d700242ce1c3caf288455407e5b5b': Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue