AI 147255: am: CL 147253 am: CL 147250 Fix a nasty typo in the docs for ContentResolver.update(). No code changes.   Original author: jham   Merged from: //branches/cupcake/...   Original author: android-build
AI 147255: am: CL 147253 am: CL 147250 Fix a nasty typo in the docs for ContentResolver.update(). No code changes.
  Original author: jham
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147255

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