tree 8a29f8e5268dcd6a514e59ee069b38d9e543fc4d
parent b94b25bce9597a672a5f39d2b17d66314e565e61
parent 5b7f5b15af016299e10d18979ec65720ab447786
author Dan Albert <danalbert@google.com> 1413532414 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413532414 +0000

am 5b7f5b15: am 4f66469b: Merge "More test makefile cleanup."

* commit '5b7f5b15af016299e10d18979ec65720ab447786':
  More test makefile cleanup.