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)
* commit '2815f1242c6c3ea1fc2df7bb5e4bd1924f4e75f7':
  Fix proxy tracing and enable tests that now work with tracing.


Trivial merge