| commit | c8c39a3ccada573f42377fa1dd1ce23592c90b09 | [log] [tgz] |
|---|---|---|
| author | Wei-Ta Chen <weita@google.com> | Wed Jan 26 21:14:34 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 26 21:14:34 2011 -0800 |
| tree | 6a90d2de1dbfdd2e78815cffa70373fa433f56c1 | |
| parent | 3b2303e3066a76372e1a4eabb9fdb595a41ad74b [diff] | |
| parent | 4877837c2da4a08b56e8cb4dfda22ae400a16621 [diff] |
am 61d9ffbf: (-s ours) Merge "Do not merge." into gingerbread * commit '61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178': Do not merge.