tree fdf8baa7ea22f05ca2828a9ee66e678845740a2a
parent 60803943f8276a311b7f985613b285a60b042886
parent ef03465f3c321415d3ef3818e943ada170fa6e10
author Vinit Deshpande <vinitd@google.com> 1410239644 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410239644 +0000

am 33e1b95c: am fc591cc1: Merge "Implement getAvailableChannels" into lmp-dev

* commit '33e1b95ca08f8ecc114665f3eed3e9c71355310c':
  Implement getAvailableChannels