tree e812e7c4951fccdfb3aacc68f42640c76a09a7ab
parent ea5828a24f3a8f6a44e2f15e76cacdb5bc524db0
parent 4f66469b29a34811b69518a266be31fe42cc111b
author Dan Albert <danalbert@google.com> 1413532077 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413532077 +0000

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

* commit '4f66469b29a34811b69518a266be31fe42cc111b':
  More test makefile cleanup.