Unsuk Jung 470d17043a am b2ff97c6: am 183662b8: am 3c88311f: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: 9feaaaf ...

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

2015-07-14 22:19:12 +00:00

..

cts

am b2ff97c6: am 183662b8: am 3c88311f: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: 9feaaaf

2015-07-14 22:19:12 +00:00