am ccb75a88: Merge "Update the API file." into gingerbread
am ccb75a88: Merge "Update the API file." into gingerbread

* commit 'ccb75a882f670f8928f13a485c0c29b8b8b93af3':
  Update the API file.

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