tree f8b8ac6ad9de6968a77be5430d2bc6545c4dee0e
parent 0c863cb5848795ac87e62dc34d2eab103c830dde
parent dd8fddd503ecffb607013109a42ee9614bd9c47c
author Colin Cross <ccross@android.com> 1389289833 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1389289834 +0000

Merge "Fix tracing on user builds"