tree 67341d55c80aed5f81eaafdfd053aeabfe0ecbeb
parent be57246603d3f6286dc6763a089daf5c1387de55
parent f36c4e12369a5819434a254c6ddb0d4efb26ae32
author Jean-Baptiste Queru <jbq@google.com> 1285547334 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1285547334 -0700

reconcile froyo-release into gingerbread

Change-Id: I0cd475594cd7697ee681bfc7eb76d61bec236417