Commits
Xavier Ducrohet authored and Android Git Automerger committed 690a9bb8adeM
am 162dd490: (-s ours) am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread * commit '162dd490cd0b502c717db59300b3fd902f76710a': Merge 2fae858d from Honeycomb-mr1. do not merge.
Showing diff to3dbc571e62d