am 8be07748: Merge "Timer sample app now uses Set a timer voice command instead of Set alarm." into klp-modular-dev

* commit '8be07748c053ab5e883a22e6cb0663cb5747ca05':
  Timer sample app now uses Set a timer voice command instead of Set alarm.
This commit is contained in:
Tony Wickham
2014-06-27 17:59:07 +00:00
committed by Android Git Automerger

View File

@@ -31,7 +31,7 @@
</intent-filter>
<!-- Set a timer voice command -->
<intent-filter>
<action android:name="android.intent.action.SET_ALARM"/>
<action android:name="android.intent.action.SET_TIMER"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>