tree d84ca5e096a414767a1bd141f1355ba7cd6e5368
parent 90fe9d0dbdfc9c161731088e5c7aea5dd66a5237
parent 1cb93ba130241dbb70b81a1fa4d2704386c6dae8
author Dianne Hackborn <hackbod@google.com> 1335479040 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335479040 -0700

Merge "Add traces for window manager and activity manager." into jb-dev