am 11b34626: am 381a2a6f: remove unused code.

Merge commit '11b34626139319004358354b74b8edb71416c919' into eclair-mr2-plus-aosp

* commit '11b34626139319004358354b74b8edb71416c919':
  remove unused code.