commit db2f5ad494c4dfc5bd0ee1840468df329678c75c
author Carl Shapiro <cshapiro@google.com> Thu Apr 15 08:42:28 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 15 08:42:28 2010 -0700
tree 26f8bcf36276d8993fdde728fe48b6e76b4f5777
parent 1888de8e13f82f7af21bce267254fac124237afe
parent f54e0a4be3e7a49e1b3f53de6b9542bc146c36fe

am f54e0a4b: Add a log tag entry for the dalvik lock profiling event.

Merge commit 'f54e0a4be3e7a49e1b3f53de6b9542bc146c36fe' into froyo-plus-aosp

* commit 'f54e0a4be3e7a49e1b3f53de6b9542bc146c36fe':
  Add a log tag entry for the dalvik lock profiling event.

logcat/event.logtags

diff --git a/logcat/event.logtags b/logcat/event.logtags
index 95a16d7..f146738 100644
--- a/logcat/event.logtags
+++ b/logcat/event.logtags
@@ -104,6 +104,7 @@
 #
 20001 dvm_gc_info (custom|2),(custom|2),(custom|2),(custom|2)
 20002 dvm_gc_madvise_info (total|1|2),(zygote|1|2)
+20003 dvm_lock_sample (process|3),(main|1|5),(thread|3),(time|1|3),(file|3),(line|1|5),(sample_percent|1|6)
 
 75000 sqlite_mem_alarm_current (current|1|2)
 75001 sqlite_mem_alarm_max (max|1|2)