tree ed069c1c5dea35eea6aff23e46b8fce7d9a74393
parent 419807a3d334be0f8a74dbd806e43c59b8862226
parent 855074043144e74156972e7a3416808dc6696452
author Elliott Hughes <enh@google.com> 1415477513 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415477513 +0000

am 85507404: Merge "Remove dead code."

* commit '855074043144e74156972e7a3416808dc6696452':
  Remove dead code.