| commit | 3c88311fb97ad77ff175b78322fdfaf63fc618e2 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Jul 14 21:42:50 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 14 21:42:50 2015 +0000 |
| tree | 359f35abe93d47ade13f889ba83cd9abc87e8447 | |
| parent | fba908c2742aef242ac165e24d2fd634fa36d2e5 [diff] | |
| parent | 9feaaaf44682c72dc5c771c93ef01ec793b6a7e3 [diff] |
Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: 9feaaaf * commit '9feaaaf44682c72dc5c771c93ef01ec793b6a7e3': Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue