tree cba24668593b1bb201a0f0de49ea5103855720c1
parent 65fbe1fcd153c5647f8d1e1a7443b3f04b7b25fd
parent 7e84d75c830b0ddaa499293723e427bca510dbaa
author Unsuk Jung <unsuk@google.com> 1436910124 +0000
committer android-build-merger <android-build-merger@google.com> 1436910124 +0000

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

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