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

Merge commit '745d1e905886ed0d8fa0a8590463093d125bc53a' into gingerbread-plus-aosp

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