| commit | 8fe633bf57b01bf133d7f2fcce55e56fc3dfa640 | [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 | 5c153ebeac0216779c05666f22955f64bbb8d505 | |
| parent | 7c98e7640fbde5a1a66a72748c146dcbe42cbdb3 [diff] | |
| parent | 0940dfb829a85c9f4f08affcbe1635c3901e64ce [diff] |
am 6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp Merge commit '6ffee9bbba53700d33456261b986ac8a3f333b9e' * commit '6ffee9bbba53700d33456261b986ac8a3f333b9e': Revert "resolve conflicts"