| commit | e0c0504c7ea508b89329d4492dea9cd97c88af42 | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Wed Nov 03 12:02:53 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 03 12:02:53 2010 -0700 |
| tree | 32ebccd7439b1fd2240633b8091c465bc942e4e6 | |
| parent | 5f4b7d8a8a394940b49ecdd8b153a0eab9528c5c [diff] | |
| parent | a3f5b615d7adc5a644cbedd55100deba562ec0ac [diff] |
am a3f5b615: (-s ours) am f3847e87: Merge "DO NOT MERGE" into gingerbread * commit 'a3f5b615d7adc5a644cbedd55100deba562ec0ac': DO NOT MERGE