tree cb1ea64ecbc34b9ef525f51bda8c5186c61a2d90
parent 9cec175c66100d9edbb1054f3f2977a5c3f80af2
parent 1279013dee790c84758e5fc5bed33b5c9df2af9b
author Jamie Gennis <jgennis@google.com> 1339441467 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339441467 -0700

Merge "Enable tracing on user builds" into jb-dev