| commit | 0940dfb829a85c9f4f08affcbe1635c3901e64ce | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Sep 08 11:03:22 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 08 11:03:22 2010 -0700 |
| tree | 716ef087ac59b90cff170eb97f989198a904a5a9 | |
| parent | 07b072ad2f2e1e6a56e03e3891686762d9a972a7 [diff] | |
| parent | 486d70d27a26186ffef19e4e2c0536521df275af [diff] |
Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp