Commits
Jim Miller authored and Android Git Automerger committed fc7135ae30cM
am 1a30acc0: (-s ours) am 6c15d1d4: am eb44da50: (-s ours) Cherry-pick from mr2 to eclair: DO NOT MERGE Merge commit '1a30acc0226360e2b98135755f68bd096e37cab8' * commit '1a30acc0226360e2b98135755f68bd096e37cab8':
Showing diff to456c8683799