OSDN Git Service

resolved conflicts for merge of ac8d7926 to honeycomb-plus-aosp
authorScott Main <smain@google.com>
Tue, 11 Jan 2011 22:51:21 +0000 (14:51 -0800)
committerScott Main <smain@google.com>
Tue, 11 Jan 2011 22:51:21 +0000 (14:51 -0800)
commitcf2106f20b8a41507a691e5f17b80c9244ae6903
tree0ef8946de9dbdabcf6371f3334ee093ed0bf9465
parentd31ae5ad2fd9c59a597eee11c307a727025860ef
parentb521dc0fe77c8f3d888c6df64247579457c25d05
resolved conflicts for merge of ac8d7926 to honeycomb-plus-aosp

Change-Id: I873904e7724c3822d6011b507649c9d2d9e9bfef