tree 6bb1bfbb83d08bb12701f0fd53c8bbd353688147
parent dd79a33ba53fec530094f4d2fe37f0538530d9f8
parent 50c529220a8af165df92f4aa6a52c3eec60282ee
author Jean-Baptiste Queru <jbq@google.com> 1285547450 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1285547450 -0700

reconcile froyo-release into gingerbread

Change-Id: I2386774732d4d0d0e46a5791dfc1b8cbeb60494b