tree 9fb762bb8b1eaf3cacb06af1db5e79d842e502c2
parent ebd2f0ae822e66f0e7682883698eff330f124c06
parent 4a671a745202cb15cc668d46400731a03b068558
author Jaikumar Ganesh <jaikumar@google.com> 1281409253 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281409253 -0700

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().