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

* commit 'ab1b304bd4cf0bb6473b21d5604596105b794362':
  Update the API file.