| commit | 30903b5e20d31771ed1d04d26a314ff3f19fba07 | [log] [tgz] |
|---|---|---|
| author | Wei-Ta Chen <weita@google.com> | Fri Oct 01 12:39:42 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 01 12:39:42 2010 -0700 |
| tree | 1f0d342cbed2ea50622e9a4e941d45ace6afca65 | |
| parent | 84ac949b0e2e63809ed25829e891ed0b784a358d [diff] | |
| parent | 75d25a5acd885d9dad3da05032810d9b35d605ed [diff] |
am eeac43ad: (-s ours) am f7681f84: Do not merge. Merge commit 'eeac43ad3c9b41c1679f3ab36064fa611106faf2' * commit 'eeac43ad3c9b41c1679f3ab36064fa611106faf2': Do not merge.