OSDN Git Service

resolved conflicts for merge of 2f65a99f to gingerbread-plus-aosp
authorMike Lockwood <lockwood@android.com>
Tue, 5 Oct 2010 20:00:13 +0000 (16:00 -0400)
committerMike Lockwood <lockwood@android.com>
Tue, 5 Oct 2010 20:00:13 +0000 (16:00 -0400)
commit81833f30599f2ec027a043e1225aaf2cb1ad5d73
tree98068ff36940ccebbfd23dc2bf49dbcfbcde2c09
parentef03f5a047d75fb7b1c32182e4d065e6f9ebef78
parent5bf21bce370f95001db1fe0910d53e19c9f99fe1
resolved conflicts for merge of 2f65a99f to gingerbread-plus-aosp

Change-Id: I9830756577dc6a64b03bc2be8788986d9034b059