commit 1347eb705f1a82fa5e7f53873fc1038f5ff984f8
author Vasu Nori <vnori@google.com> Wed Sep 09 10:32:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 09 10:32:58 2015 +0000
tree bf3229209325c2d7322be43e2abeeab5eaf57600
parent 1a684d01a35d4c90f21695bd2bebcafff379acfe
parent e4279ccbf2c4eadee14e413e90fbcc65b9f98ac8

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 may not be in S

* commit 'e4279ccbf2c4eadee14e413e90fbcc65b9f98ac8':
  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).