tree bed49462763ff7d43a3d059079248a021f2ea4a9
parent 731934d12c559a8c1bea9bdaaaba227f5974f58a
parent 207c67315c8668b72cbb7bd370f1d6c8479eabd4
author Jim Miller <jaggies@google.com> 1318470726 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318470726 -0700

am 207c6731: Merge "Fix 5444675: Fix vibrate regression on Pattern and PIN unlock screens." into ics-mr0

* commit '207c67315c8668b72cbb7bd370f1d6c8479eabd4':
  Fix 5444675: Fix vibrate regression on Pattern and PIN unlock screens.