| commit | e0e126bad38e267e5b4e31b9981ce2858b811e04 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:09:05 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:09:05 2010 -0700 |
| tree | c8f9306cc5c10307aa21b328413247e34b0c742b | |
| parent | 4dd082bff5d9f2d056affbfa0858f04dac38598e [diff] | |
| parent | c1356238ee37b872eb8672bfca95b902d6d6e065 [diff] |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Change-Id: I5263a74da476e96ac630f016f1814edfdfaf9230