| commit | 58b7fa1a2906b04636d4ea580d2feb66e628f790 | [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 | ea6f1d22b24f8eaac938dd6f1c61d0ff79601778 | |
| parent | 973c736778f27aa0d16379b49d40f3b538546f1e [diff] | |
| parent | c88194007596171b68624e08c055f796ed750b05 [diff] |
Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: c881940 * commit 'c88194007596171b68624e08c055f796ed750b05': Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue