tree a1e6e66ff3d3925e447666806cf2ea6c52acf613
parent 481d9eaba432863916c96b7bff940fab3cf3cff1
parent 1ffd80162c2129aa03ed65299421b1e69c6205eb
author Michael Jurka <mikejurka@google.com> 1353100618 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353100618 -0800

am 1ffd8016: am 6c8d6123: am 3c42e118: Merge "Cleaning up unused code" into jb-mr1.1-dev

* commit '1ffd80162c2129aa03ed65299421b1e69c6205eb':
  Cleaning up unused code