merged 2cf6cff71f w/minor conflict

This commit is contained in:
The Android Open Source Project 2009-06-12 11:14:35 -07:00
commit 38e264915c
1 changed files with 3 additions and 0 deletions

View File

@ -353,3 +353,6 @@
# aggregation service
70200 aggregation (aggregation time|2|3)
# NOTE - the range 1000000-2000000 is reserved for partners and others who
# want to define their own log tags without conflicting with the core platform.