am 7475d2e7: am 2c5db16b: Merge "Stub code no longer needed." into gingerbread

Merge commit '7475d2e7fd8ed49cf65d2762a4efda8a4c54cfac'

* commit '7475d2e7fd8ed49cf65d2762a4efda8a4c54cfac':
  Stub code no longer needed.