am 8615fdc1: (-s ours) am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s...
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 '8615fdc1'
* commit '8615fdc1':
DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!