| commit | 4a0975347941bd0e2c0fe1d2116b1666ad5b5711 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Tue May 03 16:20:11 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 03 16:20:11 2011 -0700 |
| tree | 3bfa8be5b0bd6d151c4cec29c7cbfd802d4b96d7 | |
| parent | 04753f4bb3abbcca2e78545c3c08fd230fb55383 [diff] | |
| parent | b08914475e4e94d8390996d54d87f905979238d8 [diff] |
am b0891447: (-s ours) am 8dbc643b: (-s ours) am 60d10ec9: (-s ours) Merge from gingerbread - do not merge * commit 'b08914475e4e94d8390996d54d87f905979238d8':