am 89b4cb1e: am ff38e38d: Merge "Undo API patch due to field pulled up to...
am 89b4cb1e: am ff38e38d: Merge "Undo API patch due to field pulled up to superclass." into gingerbread
Merge commit '89b4cb1e'
* commit '89b4cb1e':
Undo API patch due to field pulled up to superclass.