| commit | 78ceeb4f912399f8579366d1ba6564ae9c1a506d | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Wed Jun 11 20:21:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 11 20:21:07 2014 +0000 |
| tree | 7d4441b43285a36d08a88db1f5134b22ba89763c | |
| parent | fc9f8c00f2bb7c415a2950e025bc7d24e1551984 [diff] | |
| parent | 2fd08e2d497261521ad94b3162eeed1a3ef51e13 [diff] |
am 2fd08e2d: Merge "Fix compilation errors when setting kTracing = true." * commit '2fd08e2d497261521ad94b3162eeed1a3ef51e13': Fix compilation errors when setting kTracing = true.