tree 6df8154f302814dfeae3992abc8fc1c8d8b5aa1f
parent 7810c9b8635032ef74f85bc8237911ba563be8b0
parent fc8da7901a17f5bf064d39e6d9327c2094851428
author Elliott Hughes <enh@google.com> 1400031244 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400031244 +0000

am fc8da790: am 676e964d: Merge "Remove a test for dead code."

* commit 'fc8da7901a17f5bf064d39e6d9327c2094851428':
  Remove a test for dead code.