commit | d2a92b5b97b5a107d327744f216abdea8e0cda89 | [log] [tgz] |
---|---|---|
author | Jamie Gennis <jgennis@google.com> | Tue May 07 18:23:18 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 07 18:23:18 2013 -0700 |
tree | 0a18ab0a646783aa1cd4ffc28e2d07e1cb406792 | |
parent | 2c2283549c72184145c9f030bbfe6124ee75d169 [diff] | |
parent | db733579a4c64eddd7dadb4ac15f54658ccfc0fb [diff] |
am db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev * commit 'db733579a4c64eddd7dadb4ac15f54658ccfc0fb': atrace: add the 'dalvik' trace category