| commit | f2ac085586186f1e1f30953253b5e360e979ac69 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Mar 01 09:12:15 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 01 09:12:15 2011 -0800 |
| tree | bd73574526a2a13b96e0b8b595d33a90a6ecc804 | |
| parent | c855e277af87361a4e253f5d23205b0ba188a31f [diff] | |
| parent | c6a02ff5325e90e264ce3c5811e0e4f39aba2ef7 [diff] |
am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread * commit '7b9727558b42aecacd0ea63cf3b3c89e9bfd9e9b': Merge 1911a6f7 into gingerbread. do not merge.