tree 7a52c90020b2ff8bdfc15e58f17e157431a29d91
parent 736d42502e57152167ef6f6410dac7c227e28cba
parent 91c88cc4d8ae26a39c240b31ff9c87b9081cbf8d
author Nicolas Geoffray <ngeoffray@google.com> 1464690540 +0000
committer android-build-merger <android-build-merger@google.com> 1464690540 +0000

Merge "Blacklist test on host." am: 2e1c66e37d
am: 91c88cc4d8

* commit '91c88cc4d8ae26a39c240b31ff9c87b9081cbf8d':
  Blacklist test on host.

Change-Id: I06ba40fcd03f3e786c500765d30ab6ff69106950