Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into mnc-dev
tree: a996587f7c4e1366c0f8b74390b58fcf4ed38238
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE