tree 1c21ca938a4c44914828d6783b4a39197fd779d9
parent f467ca08dda9efece674efb0cc70c45fab4973a6
parent 8812535137ca657f6830dd01189c429bdb13c237
author Jean-Baptiste Queru <jbq@google.com> 1282615707 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1282615707 -0700

merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Change-Id: I69ed3eabde3cd32bea57315c0f031839caea4d4e