| commit | cf67abbc48d6d56538dd6f2412d6aa9863a31637 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Sep 08 11:07:30 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 08 11:07:30 2010 -0700 |
| tree | 05d6de193cf3fa73777e518d5dfeb40c4cd2d3b8 | |
| parent | d41b037c6b645768bf55d4d9efb4904373bd61b0 [diff] | |
| parent | 6ffee9bbba53700d33456261b986ac8a3f333b9e [diff] |
am 6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp Merge commit '6ffee9bbba53700d33456261b986ac8a3f333b9e' * commit '6ffee9bbba53700d33456261b986ac8a3f333b9e': Revert "resolve conflicts"