tree 1e3da50086b1606f3b68fd13ff9e7f82e655bca1
parent 5b4509b5adf2f3e12ffb7df4065fcdfd7e5e3f93
parent f197105e3bd83a1f244cb690a1aa615624629961
author Irfan Sheriff <isheriff@google.com> 1355427041 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355427041 -0800

am f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev

* commit 'f197105e3bd83a1f244cb690a1aa615624629961':
  Fix wifi compareTo