OSDN Git Service

am 549c9b17: am 4bf8d11d: Fix proxy tracing and enable tests that now work with tracing.
authorJeff Hao <jeffhao@google.com>
Fri, 15 Aug 2014 20:58:30 +0000 (20:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Aug 2014 20:58:30 +0000 (20:58 +0000)
commitab0e3e4c5618e44c9e34953dda3e7e6e086f2b64
tree241298bda1fd5ec8dafad63aa5f6037912b65a4a
parentee5618be0076ac359ab59af1c2ba945d85b2986e
parent549c9b1776c03789699f0fa6b7b0c90d7fcca019
am 549c9b17: am 4bf8d11d: Fix proxy tracing and enable tests that now work with tracing.

* commit '549c9b1776c03789699f0fa6b7b0c90d7fcca019':
  Fix proxy tracing and enable tests that now work with tracing.