OSDN Git Service

merged 2cf6cff71f36b76e816a7a90c66f4b04c71e8278 w/minor conflict
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Jun 2009 18:14:35 +0000 (11:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Jun 2009 18:14:35 +0000 (11:14 -0700)
commit38e264915c97c6bbb9f04b3250bc26e4c6294002
treee46aa467072c42269adfb9fc8598cd6c0d9d40f2
parent7490e4b170c7ca98146771ba72aab94131c33844
parent2cf6cff71f36b76e816a7a90c66f4b04c71e8278
merged 2cf6cff71f36b76e816a7a90c66f4b04c71e8278 w/minor conflict
logcat/event-log-tags