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

Merge commit 'db2f5ad494c4dfc5bd0ee1840468df329678c75c' into kraken

* commit 'db2f5ad494c4dfc5bd0ee1840468df329678c75c':
  Add a log tag entry for the dalvik lock profiling event.
This commit is contained in:
Carl Shapiro 2010-04-15 08:44:40 -07:00 committed by Android Git Automerger
commit 7ae4e690b0

View file

@ -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)