| commit | cf66c48a6fde13c914a663f93fa43a7648ce20a3 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Tue Jul 29 14:23:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 29 14:23:29 2014 +0000 |
| tree | 1be3d2c3d4bfa3a0a189d15c98c36926c812e7f1 | |
| parent | 8a586a3546958ce426f5e4c70b5360248ad68e22 [diff] | |
| parent | 8df73882c60451e7f789bf9b1f3db2d7dc228640 [diff] |
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."