tree 8126c598d92ebaee50ab16351c56997e0b483bbe
parent 4646d02dcbf13fd6be4443b6386c8233abd61e8a
parent 77eebb43aedd2441e555474949de6ecaa838bc54
author Ficus Kirkpatrick <ficus@android.com> 1440686775 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440686775 +0000

am 77eebb43: am 90aeba65: (-s ours) am 8097dda9: Merge "Specify test dependecies in rules.gradle."

* commit '77eebb43aedd2441e555474949de6ecaa838bc54':