OSDN Git Service

resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Thu, 2 Sep 2010 19:05:33 +0000 (12:05 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 2 Sep 2010 19:05:33 +0000 (12:05 -0700)
commit10f091ece5c5bf23c85d77e35f905f88d35fdc20
tree5a438d33fa40180d101fc1ad648ae2e7d3acbe3c
parent571c37bb7ab84ccb17613147aeb7334409e76669
parent1a7df62c0122fd5a98cb55bfa08c50da413ad69e
resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp

Change-Id: I5522eaf85b157efede96399856fb67a1f244dd9d