OSDN Git Service

am 8df73882: Merge "Revert "Fix proxy tracing and enable tests that now work with...
authorNicolas Geoffray <ngeoffray@google.com>
Tue, 29 Jul 2014 14:23:29 +0000 (14:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Jul 2014 14:23:29 +0000 (14:23 +0000)
commitcf66c48a6fde13c914a663f93fa43a7648ce20a3
tree1be3d2c3d4bfa3a0a189d15c98c36926c812e7f1
parent8a586a3546958ce426f5e4c70b5360248ad68e22
parent8df73882c60451e7f789bf9b1f3db2d7dc228640
am 8df73882: Merge "Revert "Fix proxy tracing and enable tests that now work with tracing.""

* commit '8df73882c60451e7f789bf9b1f3db2d7dc228640':
  Revert "Fix proxy tracing and enable tests that now work with tracing."