tree f32c147de8e8e087ca6e0a358b272550361e8347
parent 98a51de1cc39b75633922d162b81b0b3362725e6
parent 5fc8f683e6345353d418cb32f4f8335964e1613b
author Dan Albert <danalbert@google.com> 1415155988 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415155988 +0000

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

* commit '5fc8f683e6345353d418cb32f4f8335964e1613b':
  Clean up some test makefiles.