| commit | df417c903003e798ded5ae2d94c18fa3e1e7c555 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Sat Jul 12 02:05:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 12 02:05:45 2014 +0000 |
| tree | ded893f135026b4ab6f7e4fdcb956ae000057822 | |
| parent | f0948939984518be2e223c9f0d608231581a163f [diff] | |
| parent | eb97d87d62ee3c4e9f8f396dd05912178be35d58 [diff] |
am eb97d87d: am 070dfc4c: Merge "Fix tracing." * commit 'eb97d87d62ee3c4e9f8f396dd05912178be35d58':