| commit | ea182704b60551a9bd7760aa9d206ca7a7e407b8 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Mon May 23 10:21:57 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 23 10:21:57 2011 -0700 |
| tree | 662e6a15ff9d526ed70163eee15d41cdd9360f45 | |
| parent | 162dd490cd0b502c717db59300b3fd902f76710a [diff] | |
| parent | 041fd74beade4e95cff6157af9dadbf9a99b7fcf [diff] |
am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread * commit '041fd74beade4e95cff6157af9dadbf9a99b7fcf': Merge 05b7b69c from honeycomb-mr1. do not merge.