tree 7484b58a20baf64f80d36f285d448c146d7b1d6c
parent 73b1496ed9dd99f7a1e2354747466fc3488eb1ba
parent 2e0a94d22b1bd25c4fa9442e03c596bd0cb3fe76
author Matthew Xie <mattx@google.com> 1366757695 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366757695 -0700

am 2e0a94d2: am b442d074: Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev

* commit '2e0a94d22b1bd25c4fa9442e03c596bd0cb3fe76':
  Add hardware feature android.hardware.bluetooth.le