| commit | c1f3e643c2a839117475f75c9d2a123571b9ab91 | [log] [tgz] |
|---|---|---|
| author | Patrick Scott <phanna@android.com> | Wed Dec 01 09:22:01 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 01 09:22:01 2010 -0800 |
| tree | 92a5929d1269371b0b9b38c03f9d9a8fa322c898 | |
| parent | 919b94d14b87fe91e161106b4741e0d46fc97200 [diff] | |
| parent | 1f1d4800c06936c4cc8316cb846acabf38a395fe [diff] |
am 1f1d4800: (-s ours) am c1788926: am 09599d48: (-s ours) Do not merge. * commit '1f1d4800c06936c4cc8316cb846acabf38a395fe': Do not merge.