| commit | 4bcce972cdc85ddd1efaa2e3155e86a658bda467 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Mar 15 12:07:43 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 15 12:07:43 2011 -0700 |
| tree | 305f964a9c8f82baa3a48beffb254d4881db817c | |
| parent | 7912c457f032513d7a3feaf62ddacfa62ebe253e [diff] | |
| parent | 9b50c1fcda99fd74fe40b6393d57f9dacc8c7d12 [diff] |
am 9b50c1fc: (-s ours) am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge. * commit '9b50c1fcda99fd74fe40b6393d57f9dacc8c7d12': Merge 9d76581f from honeycomb. do not merge.