merge
authorKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 10 Feb 2011 23:40:11 +0000 (15:40 -0800)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 10 Feb 2011 23:40:11 +0000 (15:40 -0800)
commitf10aeddbe82c6ba177ed2389f7176153202c4464
tree1843589ac56538e24cbe2288ce5b666e9a81e4a6
parent5303367e76c2e61bdf7f30250d9a9137eb697e27
parent6c50ee072735e5d5c7580002078e3a1ff9c23323
merge
nearbydevicesmodel.cpp