| commit | 34d6c0b7bb5302094505764244a6314a0ab4a0bc | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Jun 28 19:00:25 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 28 19:00:25 2011 -0700 |
| tree | 6fb205a733931a18b7a55cc3ef341c19b33e7496 | |
| parent | 1498c97163068a930a2642699eada598971ad5ba [diff] | |
| parent | b05d71e51cf06427d0ebf54435975b42fc9d4762 [diff] |
am 66044737: (-s ours) am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread * commit '660447379d07f2e7480a30784f04cdd476877d73': CherryPick 06942bc4 from hc-mr1. do not merge.