tree c58f29058fad414729497960b1db2ad420ede7ee
parent ad64befd25befae3d71c53be6d6a31d1f8d12464
parent bcaaebb8a881951720190f4a6b9ffcbf871542af
author Dan Albert <danalbert@google.com> 1411164878 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411164878 +0000

am bcaaebb8: Merge "Clean up test makefiles."

* commit 'bcaaebb8a881951720190f4a6b9ffcbf871542af':
  Clean up test makefiles.