| commit | 9cb1acda89919a46583444f788f4808fecd5d78d | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Mar 15 11:57:30 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 15 11:57:30 2011 -0700 |
| tree | 19c0985c9095029ae4fba30d617f263858ed8a38 | |
| parent | b8796212e3544262193960ade01db6cb2023c8f9 [diff] | |
| parent | 405cb57019e0b0b9c2049c2b06537c0f4981fc37 [diff] |
am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread * commit '405cb57019e0b0b9c2049c2b06537c0f4981fc37': Merge c12b4093 from honeycomb. do not merge.