Commits
Dianne Hackborn authored and Android Git Automerger committed cfbdf8d0b5bM
am 8615fdc1: (-s ours) am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread Merge commit '8615fdc15146d27cc2d3a8efbe57f0a425b19efb' * commit '8615fdc15146d27cc2d3a8efbe57f0a425b19efb': DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!
Showing diff to84d10ad4294