tree 8126c598d92ebaee50ab16351c56997e0b483bbe
parent cf505b2c57ae44538fc2ff935b08510570c89b76
parent ab58b3894211e0ffaafbadcb70ca9d67c6a7fb5d
author Michal Bendowski <bendowski@google.com> 1440686778 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440686778 +0000

am ab58b389: am 8cb9c581: (-s ours) am b4d7d295: Merge "Revert "Specify test dependecies in rules.gradle.""

* commit 'ab58b3894211e0ffaafbadcb70ca9d67c6a7fb5d':