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