tree dbd930f9b12ebf1f4daab4a1dfbdb138f8cebaae
parent f9080cc30532d19d818caa5feb696c410ac4f771
parent 9c5945d0fdd6783d8bd393e4444140e76eced518
author Andreas Huber <andih@google.com> 1281475292 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281475292 -0700

am d35498f6: am 1a140bf6: Merge "Remove some obsolete code." into gingerbread

Merge commit 'd35498f6062410e777d6ad41a720db32336e2089'

* commit 'd35498f6062410e777d6ad41a720db32336e2089':
  Remove some obsolete code.