| commit | bfd0aabaa5222173f74915b68a560d098deebc80 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Thu Sep 10 03:47:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 10 03:47:23 2015 +0000 |
| tree | c994dfacf06abb7e8dcd7bd65561efecf149a1b1 | |
| parent | 32540663fe6b9982c4542a7371bc5280fdf6ba29 [diff] | |
| parent | b8ad8a1a990597951faaf9e82722e628ff74c0e3 [diff] |
am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev * commit 'b8ad8a1a990597951faaf9e82722e628ff74c0e3': Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue