OSDN Git Service

resolved conflicts for merge of 1e348378 to eclair
authorMike LeBeau <mlebeau@android.com>
Fri, 28 Aug 2009 06:54:12 +0000 (23:54 -0700)
committerMike LeBeau <mlebeau@android.com>
Fri, 28 Aug 2009 06:54:12 +0000 (23:54 -0700)
commit4e97ab5ca2a5908797d98097e6caecf38572ca6a
tree860d0e4c79392a6d84b7bb4b57086784a2132257
parent89795d8fa6da8b2f42372ed6bcae0bc1420d19a3
parent681614fecd813b0d330575c06c6f369907bd31d1
resolved conflicts for merge of 1e348378 to eclair