tree 558789b53bf9241b08b9d4fab24f5d6852cd3146
parent 440185cdd383289fbf8afec353aa64fe0ed30773
parent c7249660f908c74687b5fdadc1296eb9d4903cc7
author Dan Albert <danalbert@google.com> 1414069497 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414069497 +0000

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

* commit 'c7249660f908c74687b5fdadc1296eb9d4903cc7':