tree ddbc04990de0e8c0a4dab62df94f92a38d4f7193
parent afce7a8b4a2f856c2ec6aff8d246baff11e57f76
parent bf96b3051cf2219d3255dc90848f38a8e91870c7
author Unsuk Jung <unsuk@google.com> 1401475855 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401475855 +0000

am bf96b305: am a497b094: am 79f6c260: Disable host side holotests also

* commit 'bf96b3051cf2219d3255dc90848f38a8e91870c7':
  Disable host side holotests also