| commit | ae61ee66dcd94ac6854bbcf42ff443ca02e13f01 | [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 | 0cb98f4a140191ed56ffbdb595221945fade125b | |
| parent | 76640971d1608cd4061b9263f3eae4c009370a5e [diff] | |
| parent | a2adbcb0048d962c1d5833087b7a4c9404bcb613 [diff] |
am a3f5b615: (-s ours) am f3847e87: Merge "DO NOT MERGE" into gingerbread * commit 'a3f5b615d7adc5a644cbedd55100deba562ec0ac': DO NOT MERGE