Unsuk Jung 3c88311fb9 Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 ...

automerge: 9feaaaf

* commit '9feaaaf44682c72dc5c771c93ef01ec793b6a7e3':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue

2015-07-14 21:42:50 +00:00

..

cts

Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75

2015-07-14 21:42:50 +00:00