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

Merge commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea'

* commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea':
  Undo API patch due to field pulled up to superclass.