| commit | b8ad8a1a990597951faaf9e82722e628ff74c0e3 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Wed Sep 09 22:19:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 09 22:19:06 2015 +0000 |
| tree | 33f10b124e93b05cdd5def7b2076845a171f807e | |
| parent | 4ed5d94e1d5d3d4eb12bf7e2318cb6396315f2c1 [diff] | |
| parent | 9d02ab84846ebdb5c6ad89e70c4b8a366df92c97 [diff] |
am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev * commit '17607b8a36287108099db71b9a15f20d64434203': Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue