tree 5629afa73bc759151c430788271222f3432b7876
parent 0eb01572eec821fb8eb49c09bdb74821aa740552
parent e2f613871041b0356cc99a681d527557998fb072
author Michal Karpinski <mkarpinski@google.com> 1474447679 +0000
committer android-build-merger <android-build-merger@google.com> 1474447679 +0000

Merge "Rename the DnsEventListenerService to NetdEventListenerService" am: 1e3f586c10
am: e2f6138710

Change-Id: I001724d2145058df0b51e581855fd663f815c209