| commit | 34d878a404dba798f016faf475ea95f9fa0e2c6e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri May 13 18:27:22 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 13 18:27:22 2016 +0000 |
| tree | eaa58678c94189f70735c5f48c3213a6c0a7f452 | |
| parent | 4da20f9db8ceb136a566cc3eb9ba27998b2361bd [diff] | |
| parent | ede540ae94aa9637229b777defaeb51f782ef32a [diff] |
resolve merge conflicts of d64a3fc to nyc-dev-plus-aosp am: ede540ae94 * commit 'ede540ae94aa9637229b777defaeb51f782ef32a': Admit that dnsmasq relies on BSD extensions. Change-Id: I76b2d81eb95c9010c143b3c76a7df77d5067ac94