| commit | 3d29a211acddc3ffe31e66c7a1f655aa53c8a292 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Mar 17 16:27:42 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 17 16:27:42 2011 -0700 |
| tree | efc129f9ba0331b409e5593e3d6c75e4b22272ed | |
| parent | cc4d56f9ee0321e449a70083fc31d6b7713b8347 [diff] | |
| parent | 68957a0d7516c82b8cb4050f15294c663bf08338 [diff] |
am 68957a0d: (-s ours) am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0 from honeycomb. Do not merge. * commit '68957a0d7516c82b8cb4050f15294c663bf08338': Merge 67450db0 from honeycomb. Do not merge.