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

Merge commit '2c5db16ba90b0ec5187dc0a02c4ba9e024cd397c' into gingerbread-plus-aosp

* commit '2c5db16ba90b0ec5187dc0a02c4ba9e024cd397c':
  Stub code no longer needed.