am a614b948: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp

Merge commit 'a614b948e18189adfe8e2553754db574ecb3fd7a'

* commit 'a614b948e18189adfe8e2553754db574ecb3fd7a':
  Make PhoneStateListeners not call TelephonyManager
  Setting WebCore cache limit depending on the memory class.