tree 8cb9e4d4e8c16246533d63c4b4e196d524e366fe
parent 39efe3e5bf6282a4851e0eb3b938060c8f7790ae
parent c52e54c47184704613d446eb15d051ceb43d82b3
author Dan Albert <danalbert@google.com> 1413568390 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413568390 +0000

am c52e54c4: Merge "Some more test cleanup."

* commit 'c52e54c47184704613d446eb15d051ceb43d82b3':
  Some more test cleanup.