OSDN Git Service

resolved conflicts for merge of a1727092 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Mon, 30 Aug 2010 21:13:18 +0000 (14:13 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 30 Aug 2010 21:13:18 +0000 (14:13 -0700)
commitc111863fbf2d8b4ccf0b3d82864165dadc4a6f11
tree002f4fdcff3be08c7a480d7a604e9f9d4fca84f3
parentdb0017e5e2c167f6dfe0f95ad02063970d95e37d
parenta1727092595a65e4dd9d9a6bae3778ad8c31d77f
resolved conflicts for merge of a1727092 to gingerbread-plus-aosp

Change-Id: Icce8b9cb0c6ebfe2c4278c19c50aafb85a9ba4d8