| commit | db4bd4bbb8d51e3f081aefefc4e5766be2690268 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Wed Jun 11 21:48:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 11 21:48:43 2014 +0000 |
| tree | 961acaf7a5ae45c9ffd2a2fc7c3848f37a6d2aee | |
| parent | 1990211710ca3b93042f500e0b09e9340b04a760 [diff] | |
| parent | 78ceeb4f912399f8579366d1ba6564ae9c1a506d [diff] |
am 78ceeb4f: am 2fd08e2d: Merge "Fix compilation errors when setting kTracing = true." * commit '78ceeb4f912399f8579366d1ba6564ae9c1a506d': Fix compilation errors when setting kTracing = true.