Merge commit '0e1229260d66b308a0ad271c20970e3decd6f55c' into froyo-plus-aosp * commit '0e1229260d66b308a0ad271c20970e3decd6f55c': Rename private fields to break bad code examples
Merge commit '0e1229260d66b308a0ad271c20970e3decd6f55c' into froyo-plus-aosp * commit '0e1229260d66b308a0ad271c20970e3decd6f55c': Rename private fields to break bad code examples