| commit | 549c9b1776c03789699f0fa6b7b0c90d7fcca019 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Fri Aug 15 17:38:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 15 17:38:49 2014 +0000 |
| tree | 3dea5774b1a1702be5df59f04905fbf1171ce410 | |
| parent | d3db28a47fe11e49096078e64f43bb246b519b68 [diff] | |
| parent | 4bf8d11df5dccc1b276cd9c40a98e8a14d79a9c8 [diff] |
am 4bf8d11d: Fix proxy tracing and enable tests that now work with tracing. * commit '4bf8d11df5dccc1b276cd9c40a98e8a14d79a9c8': Fix proxy tracing and enable tests that now work with tracing.