| commit | f742ea6d30fde381f6b93776fe247b232edebd74 | [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 | 392a12ecbd810b26f2c8ad5471560065a0577aa2 | |
| parent | 67651de7590224c2483d0e574217a0939b5c78bd [diff] | |
| parent | bfd0aabaa5222173f74915b68a560d098deebc80 [diff] |
am bfd0aaba: am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev * commit 'bfd0aabaa5222173f74915b68a560d098deebc80': Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue