am ad60e7fe: Merge change I9485aec1 into eclair

Merge commit 'ad60e7fe2c9588cd16c1351419af90964beb232d' into eclair-mr2

* commit 'ad60e7fe2c9588cd16c1351419af90964beb232d':
  Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
tree: 4d8a57bdd445ec07fe3c381bf1e9c7e28735499d
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE