| commit | f171a53c05020fff2f54fad555da78f33c7deccf | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Fri May 13 21:26:10 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 13 21:26:10 2016 +0000 |
| tree | 76e6e06661a3b5f0fe5a928aace731c74bf399e1 | |
| parent | 34d878a404dba798f016faf475ea95f9fa0e2c6e [diff] | |
| parent | 4e50ad7f2be39d160e76ef5d8af5391bd4cd8a68 [diff] |
resolve merge conflicts of eb50a53 to nyc-dev-plus-aosp am: 4e50ad7f2b * commit '4e50ad7f2be39d160e76ef5d8af5391bd4cd8a68': Suppress unused-parameter/variable warnings in dnsmasq. Change-Id: I39dc66204c0f4ddde544350aacb6851b8f0f0b8f