am 5a67749a: am 987e8d7f: Merge "Fix Vibrator permission CTS test broken earlier." into gingerbread

Merge commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1'

* commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1':
  Fix Vibrator permission CTS test broken earlier.
This commit is contained in:
Brad Fitzpatrick 2010-10-19 13:38:00 -07:00 committed by Android Git Automerger
commit 5a2d4572c9

Diff Content Not Available