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