OSDN Git Service

resolved conflicts for merge of 272eb7 to master
authorMike Lockwood <lockwood@android.com>
Wed, 3 Jun 2009 21:32:15 +0000 (14:32 -0700)
committerMike Lockwood <lockwood@android.com>
Wed, 3 Jun 2009 21:32:15 +0000 (14:32 -0700)

Trivial merge