tree 0823ca5bb8b90967c8470ac079879d7e7a5da934
parent f59e2624b33a428bbe484168ac4f96ca36a6c32e
parent 021aa4cefe03fd7cca5ee4baf25a562c6f6cda20
author Jeff Sharkey <jsharkey@android.com> 1365725688 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365725688 -0700

am 021aa4ce: Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev

* commit '021aa4cefe03fd7cca5ee4baf25a562c6f6cda20':
  DO NOT MERGE. Fix build by removing old file.