OSDN Git Service

resolved conflicts for merge of abb08550 to master
authorrepo sync <chiachi@android.com>
Tue, 30 Jun 2009 03:06:14 +0000 (11:06 +0800)
committerrepo sync <chiachi@android.com>
Tue, 30 Jun 2009 03:09:06 +0000 (11:09 +0800)
commit60a4cd5e348ae263d209a7f64510826825848208
treed3beeb9ae9744817c3067a50eed6c2e11fa56e6d
parent24f3a2fe8f4b63497654a774af11615cd70b4c2b
parentabb0855010a918747a199367d99b5ca5ade105e2
resolved conflicts for merge of abb08550 to master
include/private/android_filesystem_config.h
init/devices.c