| commit | cccdd9b7acd3cc55b4735817e6f4f451d3cf75c6 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 18 18:13:53 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 18 18:13:53 2010 -0700 |
| tree | 2ad04d7b443cc5674ea566016205b1904b1451f8 | |
| parent | 8c14cbb5f439c2cb71f162ecb88c9bd8dbab0251 [diff] | |
| parent | 922ce38ed77e207fcf4af9be6f98ca17f3ba0b3b [diff] |
am 922ce38e: (-s ours) DO NOT MERGE - reconcile open-source variant Merge commit '922ce38ed77e207fcf4af9be6f98ca17f3ba0b3b' into gingerbread * commit '922ce38ed77e207fcf4af9be6f98ca17f3ba0b3b': DO NOT MERGE - reconcile open-source variant