tree b12242a9e0b8beeb518a20d9800680b7928ebc8d
parent 73616a4b32e89ee79aadca13fc01f7c8142f0e6a
parent 1347eb705f1a82fa5e7f53873fc1038f5ff984f8
author Vasu Nori <vnori@google.com> 1441795050 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441795050 +0000

am 1347eb70: am e4279ccb: am ed2852cf: am a6ca91d9: am f1f502b5: Merge "Skip CTS tests if zen_mode or airplane setting is not set or if voice intents are not supported by the platform. This can happen on certain platforms (fugu, for example) or on devices (zen_mode ma

* commit '1347eb705f1a82fa5e7f53873fc1038f5ff984f8':
  Skip CTS tests if zen_mode or airplane setting is not set or if voice intents are not supported by the platform. This can happen on certain platforms (fugu, for example) or on devices (zen_mode may not be in Settings, for example).