tree bc5585a4b9cea5512c0c28ff48c93095c5785179
parent fa3fce9237c1d9641031d306242b45b979309f2c
parent a6eaa197f3f6d96696cddf5c2bf86ac628e461d8
author Elliott Hughes <enh@google.com> 1364003988 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364003988 -0700

am a6eaa197: Merge "Remove dead code that\'s keeping other dead code in frameworks/base alive."

* commit 'a6eaa197f3f6d96696cddf5c2bf86ac628e461d8':
  Remove dead code that's keeping other dead code in frameworks/base alive.