summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhoulu Luo <zluo@codeaurora.org>2014-09-04 14:47:24 -0700
committerZhoulu Luo <zluo@codeaurora.org>2014-09-04 14:47:24 -0700
commit6579bc66d67c04ec0532598e354b16113b2f2315 (patch)
tree7cff08abf63cfa2362789006b5b6b42231ebae9a
parent4143de2f26d059988405270610c3af55d53600fa (diff)
parent9bc0888d4b95a1b1aca53e698f38eda166cd9e60 (diff)
downloadandroid_hardware_qcom_bt-6579bc66d67c04ec0532598e354b16113b2f2315.tar.gz
android_hardware_qcom_bt-6579bc66d67c04ec0532598e354b16113b2f2315.tar.bz2
android_hardware_qcom_bt-6579bc66d67c04ec0532598e354b16113b2f2315.zip
Merge tag 'AU_LINUX_ANDROID_KK.04.04.04.010.136' into HEAD
AU_LINUX_ANDROID_KK.04.04.04.010.136 based on quic/aosp/kk Conflicts: libbt-vendor/src/bt_vendor_qcom.c Change-Id: I6adc451dac2799fcf5223dbb11f032edfb11cbb1
0 files changed, 0 insertions, 0 deletions