OSDN Git Service

resolved conflicts for merge of 01beea4b to master
authorSharvil Nanavati <sharvil@google.com>
Sat, 28 Jun 2014 19:18:07 +0000 (12:18 -0700)
committerSharvil Nanavati <sharvil@google.com>
Sat, 28 Jun 2014 19:18:07 +0000 (12:18 -0700)
commit4da1c04ddb14138bcc2fc98f14ae8bd36f611813
tree6199891db735982b7dff92992a17a47de500c399
parent06ec60bf4a8d0400f358aefe1aa5473725071b41
parent01beea4bffb1dc59e5fbdfe81c13dc1e4cc82635
resolved conflicts for merge of 01beea4b to master

Change-Id: I340c31de8ece1580a9a6ab9370b9815ecdd54b49
bta/dm/bta_dm_cfg.c