| commit | f837358fc46c2e680e44b8b12d03bdecf98a642c | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Apr 07 14:24:00 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 07 14:24:00 2011 -0700 |
| tree | 6446fdfd35230a7bd1987c3681f0f6b09751d380 | |
| parent | 82863327e380c191090240ddd216233443623d1c [diff] | |
| parent | fee8d78ce8e1177a1d1ef59f34fde2319470c07f [diff] |
am 65ef6e86: (-s ours) am 96ac8560: am 515a08b0: Merge 59aad78e from master. do not merge. * commit '65ef6e8690cc13e9e20582fd0236b18eaae204b9': Merge 59aad78e from master. do not merge.