| commit | e1ca9e954470a5d5abfcafe57e5805528e2b0c96 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Tue Jul 29 14:27:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 29 14:27:08 2014 +0000 |
| tree | 1be3d2c3d4bfa3a0a189d15c98c36926c812e7f1 | |
| parent | 6648a7009329082b673a7eac3bbc2359f3a91dad [diff] | |
| parent | cf66c48a6fde13c914a663f93fa43a7648ce20a3 [diff] |
am cf66c48a: am 8df73882: Merge "Revert "Fix proxy tracing and enable tests that now work with tracing."" * commit 'cf66c48a6fde13c914a663f93fa43a7648ce20a3': Revert "Fix proxy tracing and enable tests that now work with tracing."