tree 8a4bda10916ab95210c6938d4b69f9bd4038b000
parent 37855cb25a086d7ed4a28e5a46371538e73dbc69
parent 90aeba65f03978448cd3e7615b4dae96ac6dcddc
author Ficus Kirkpatrick <ficus@android.com> 1440672729 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672729 +0000

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

* commit '90aeba65f03978448cd3e7615b4dae96ac6dcddc':