| commit | 6e02dc4a6cc1d353e55e05ea632183fae4a62796 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:07:43 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:07:43 2010 -0700 |
| tree | 8577c37dffcd436817c73a196428c12e55a1910e | |
| parent | c7f606bdf71b2d6cc152867801412a4186efdd07 [diff] | |
| parent | b503197440fdf617b436ed3c9ea3f3877ba97394 [diff] |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Change-Id: I3372dbe960ceabe0dec5258b4eb52080bbae2fb1