tree 7c08960c2b1f5f4ee241c921733ca9a27b76d69b
parent 9825af9e9b76bda73154691164ca87abe9e7c45c
parent dc1c2820c777ecb97417b3dd4cd389169a48696c
author Dan Albert <danalbert@google.com> 1415157769 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415157769 +0000

am dc1c2820: am 5fc8f683: am 7a92d20e: Merge "Clean up some test makefiles."

* commit 'dc1c2820c777ecb97417b3dd4cd389169a48696c':
  Clean up some test makefiles.