| commit | 5cd7604cb578d715ee3898295fa65b131a1ecd25 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Tue Jul 29 01:40:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 29 01:40:37 2014 +0000 |
| tree | db5b34142d812f95581a864b681940efc94c6945 | |
| parent | 146409dc095f18a95e283f8a5d667d67ad861f92 [diff] | |
| parent | 2815f1242c6c3ea1fc2df7bb5e4bd1924f4e75f7 [diff] |
am 2815f124: Merge "Fix proxy tracing and enable tests that now work with tracing." * commit '2815f1242c6c3ea1fc2df7bb5e4bd1924f4e75f7': Fix proxy tracing and enable tests that now work with tracing.