| commit | 9c461c6ea5c254e1e79381ba076a07b067329e81 | [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 | cd17f77bf1022f1dd132aecd6d13aa604b89e3c6 | |
| parent | 80f7c594fae3f1b19e3ea78938de450418fe183c [diff] | |
| parent | 65ef6e8690cc13e9e20582fd0236b18eaae204b9 [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.