tree 5f6d1371280e837181a7fc331abfade57f25cdc8
parent f7638c963270c53e0647d6751620f625c41d9633
parent df3b453429c1bbb9d9524c471989287d10cf2f40
author Kenny Root <kroot@google.com> 1440653225 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440653225 +0000

am df3b4534: (-s ours) am c2c94b1a: Merge "Revert "Delete obsolete hamcrest-hostdex rule.""

* commit 'df3b453429c1bbb9d9524c471989287d10cf2f40':