am 4a671a74: am 745d1e90: Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread

Merge commit '4a671a745202cb15cc668d46400731a03b068558'

* commit '4a671a745202cb15cc668d46400731a03b068558':
  Update javadoc for the API and change return of getBondedDevices().