| commit | d31825ad49e7a0fe06548e8b1dc0250f80dd2178 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Thu Jul 10 11:01:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 10 11:01:14 2014 +0000 |
| tree | 72bac4c0e5f018e203cdac2d5e536b69115cd615 | |
| parent | b872062a4dd50a95c0dc05125933db7e29f759ef [diff] | |
| parent | 0cb6d725ffa27ff3b53761558ae6ced5c047de84 [diff] |
am 0cb6d725: am 070dfc4c: Merge "Fix tracing." * commit '0cb6d725ffa27ff3b53761558ae6ced5c047de84': Fix tracing.