am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1
am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1

* commit 'fead0e14b437e80b1c2b0578ec33fc5cbf910ddf':
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base