OSDN Git Service

resolved conflicts for merge of a9b1e01a to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Fri, 23 Jul 2010 21:14:07 +0000 (14:14 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 23 Jul 2010 21:15:01 +0000 (14:15 -0700)
commit66282a6a092f8466bc3dddf24663c58b112455d3
tree83d1eb96c1b64e1b68daa8fb84d7ff61e633acb1
parent39877265553ee566c51b557666f3979133d5701f
parent410d0ea5a4b7a2d27755bbee24b9a8aed7a6097e
resolved conflicts for merge of a9b1e01a to gingerbread-plus-aosp

Change-Id: Ief79eaa532b583d9608701d48464b7afdc493bac