Brad Fitzpatrick 33476b2db8 am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread ...

Merge commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6' into gingerbread-plus-aosp

* commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6':
  Don't crash on null Vibrator during reboot.

2010-10-15 08:51:01 -07:00

..

config

…

java

am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread

2010-10-15 08:51:01 -07:00

jni

am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread

2010-10-13 22:54:10 -07:00

res

am b593d976: Merge "Updated GPS icons and new status bar background" into gingerbread

2010-10-14 18:36:39 -07:00

tests

am 8f666c2d: Merge "Test that we don\'t leak sensitive information when logging cookies." into gingerbread

2010-10-14 16:02:57 -07:00