| commit | 0ad1c69d30d5a0e7820e42c37792525f7bdf4a3a | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Jan 25 15:39:11 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 25 15:39:11 2011 -0800 |
| tree | b4b8f199ba1be5e675c1b233a5dae3a2d02ec644 | |
| parent | 27fc0176e4a6c41dcfc57f179868fc7b17ba07ec [diff] | |
| parent | daf0b895e8e0c952cc8563972d74a5e06fba7d0b [diff] |
am daf0b895: (-s ours) Cherry-pick f0e5e933 from master. * commit 'daf0b895e8e0c952cc8563972d74a5e06fba7d0b': Cherry-pick f0e5e933 from master.