| commit | bca5f6bad563da6ac19ae94b20ee2733691be0c5 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Mon Oct 18 08:04:35 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 18 08:04:35 2010 -0700 |
| tree | 60e01d1b54244b5da6a07286d5794b6fb7346442 | |
| parent | a20a97c95cad7b795d82d3e7892955f68a5b9803 [diff] | |
| parent | e6b39358d7e514198c8643b451a2dd7657cd9a00 [diff] |
am cf66f587: (-s ours) am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbread Merge commit 'cf66f587514a935c290c8c9558243a48ba0243eb' * commit 'cf66f587514a935c290c8c9558243a48ba0243eb': fix build DO NOT MERGE