| commit | 2a559ec9132db6f028085541cb656218417af3bc | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 18 18:15:50 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 18 18:15:50 2010 -0700 |
| tree | 2df569d436e2a08aca8771c8ab3e4b8b427e8e56 | |
| parent | 3c8c37f77da161f9a5776bb6af2f996bcc8b854a [diff] | |
| parent | cccdd9b7acd3cc55b4735817e6f4f451d3cf75c6 [diff] |
am cccdd9b7: am 922ce38e: (-s ours) DO NOT MERGE - reconcile open-source variant Merge commit 'cccdd9b7acd3cc55b4735817e6f4f451d3cf75c6' into gingerbread-plus-aosp * commit 'cccdd9b7acd3cc55b4735817e6f4f451d3cf75c6': DO NOT MERGE - reconcile open-source variant