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

* commit 'e6269f7988a2ec0d1f9ea37d92d6b0ca2f3dc3b8':
  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