OSDN Git Service

am 2815f124: Merge "Fix proxy tracing and enable tests that now work with tracing."
authorJeff Hao <jeffhao@google.com>
Tue, 29 Jul 2014 01:40:37 +0000 (01:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Jul 2014 01:40:37 +0000 (01:40 +0000)
commit5cd7604cb578d715ee3898295fa65b131a1ecd25
treedb5b34142d812f95581a864b681940efc94c6945
parent146409dc095f18a95e283f8a5d667d67ad861f92
parent2815f1242c6c3ea1fc2df7bb5e4bd1924f4e75f7
am 2815f124: Merge "Fix proxy tracing and enable tests that now work with tracing."

* commit '2815f1242c6c3ea1fc2df7bb5e4bd1924f4e75f7':
  Fix proxy tracing and enable tests that now work with tracing.