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)

Trivial merge