commit | 7eb54c8629672daad3059996530ff7f80f8350cb | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Jan 24 13:29:15 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 24 13:29:15 2011 -0800 |
tree | fd8a07d3e9b14d4de4d6357777bdd4321bf0ad0b | |
parent | 3d85bbd288cac078ae8938b8be5d243f77535a30 [diff] | |
parent | 8b30f1e174b3c05ce2faf4e709c8bccd9d596ba1 [diff] |
am 8b30f1e1: (-s ours) am fce88928: (-s ours) Revert "Merge commit \'50738779\' into gingerbread-plus-aosp" - do not merge * commit '8b30f1e174b3c05ce2faf4e709c8bccd9d596ba1': Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not merge