Merge commit 'b3d2494' into master_merge
tree: 22b0b32056c1d341636127a00ca60379f41ba54a
  1. libbt-vendor/
  2. msm8960/
  3. msm8992/
  4. Android.mk