| commit | 5732308e3999829f896940ed9f946615b195dc41 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Jun 28 19:00:25 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 28 19:00:25 2011 -0700 |
| tree | 0154a39d8c1b08efb8d5291b8ff940cee9997e4c | |
| parent | d0bc3ad8aecf2d33489b98f217d10b8d6057d7c2 [diff] | |
| parent | 660447379d07f2e7480a30784f04cdd476877d73 [diff] |
am 66044737: (-s ours) am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread * commit '660447379d07f2e7480a30784f04cdd476877d73': CherryPick 06942bc4 from hc-mr1. do not merge.