Skip to content
Commit 90c420f6 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge changes from topic "dnssdtxtrecord-jarjar" 

* changes:
  Jarjar DnsSdTxtRecord into framework-wifi
  Build framework-telephony-stubs against core_current
parents 83d3fb18 6c82ddd6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment