summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-07-07 12:32:54 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-07-07 14:16:05 -0700
commit8c6a7c500e1a160b3fffaf1ffd5d826659fdffe5 (patch)
tree1e95cbbabe6f2b5b2e17edf2841c7f921eff39c0 /conf
parent2e63e65c7a558415f64a1957bd9cc060ab10f64e (diff)
parent514139f4b40cbb035bb92f3e24d5a389d75db9e6 (diff)
downloadandroid_system_bt-8c6a7c500e1a160b3fffaf1ffd5d826659fdffe5.tar.gz
android_system_bt-8c6a7c500e1a160b3fffaf1ffd5d826659fdffe5.tar.bz2
android_system_bt-8c6a7c500e1a160b3fffaf1ffd5d826659fdffe5.zip
Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEAD
Ticket: CYNGNOS-3020 Change-Id: I0d26ff4917b8886ca5fcc54b235bdb6afe8d8925
Diffstat (limited to 'conf')
0 files changed, 0 insertions, 0 deletions