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