summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-09-15 12:17:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-15 12:17:19 -0700
commit9a5c61a2777ea41dbbe1fbfc4ad3ea4203993302 (patch)
tree4815b9e8e8e5996c213af8a715e3268f84dfc00c
parentf254ddc7616e281b59b6e68f8ad0020bf682ed0b (diff)
parent2c42e4404bba0a1b065d223a1e84ef7184e1a987 (diff)
downloadsystem_core-9a5c61a2777ea41dbbe1fbfc4ad3ea4203993302.zip
system_core-9a5c61a2777ea41dbbe1fbfc4ad3ea4203993302.tar.gz
system_core-9a5c61a2777ea41dbbe1fbfc4ad3ea4203993302.tar.bz2
am 2c42e440: am 9915e3fd: Add dvm_lock_sample\'s new fields.
Merge commit '2c42e4404bba0a1b065d223a1e84ef7184e1a987' * commit '2c42e4404bba0a1b065d223a1e84ef7184e1a987': Add dvm_lock_sample's new fields.
-rw-r--r--logcat/event.logtags2
1 files changed, 1 insertions, 1 deletions
diff --git a/logcat/event.logtags b/logcat/event.logtags
index d41f36b..9ab8504 100644
--- a/logcat/event.logtags
+++ b/logcat/event.logtags
@@ -104,7 +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)
+20003 dvm_lock_sample (process|3),(main|1|5),(thread|3),(time|1|3),(file|3),(line|1|5),(ownerfile|3),(ownerline|1|5),(sample_percent|1|6)
75000 sqlite_mem_alarm_current (current|1|2)
75001 sqlite_mem_alarm_max (max|1|2)