tree a5e8117c70561fe6077c88b8678a2a74b9d28d82
parent 565af3834c8c4c353fd9bbdffcf2b7817b55f09b
parent 506b68e1c586ea3956c939c4181f11e5a112a2f5
author Amith Yamasani <yamasani@google.com> 1363128177 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363128177 -0700

am 506b68e1: Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"

* commit '506b68e1c586ea3956c939c4181f11e5a112a2f5':
  Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY