| commit | 2216f806fd10b90c8039d4bec12917c1de356b24 | [log] [tgz] |
|---|---|---|
| author | Andrew Appleby <andrewa@fairphone.com> | Tue May 29 15:54:49 2018 +0200 |
| committer | Andrew Appleby <andrewa@fairphone.com> | Tue May 29 15:55:30 2018 +0200 |
| tree | 2e29b5f8c53c80bbf310cf3b99166ef49a9fcc3d | |
| parent | aff8bddc7f3a3fa7fda7e68f32ec0612780d1eb8 [diff] | |
| parent | 3576bc546eb6122cd6266e9a30eb19e3c99547d8 [diff] |
Merge the 2018-05-05 SPL branch from AOSP-Partner into android-7.1.2_r36 * origin/security-aosp-nyc-mr2-release: Add extra (size_t) cast to avoid compiler warning. Make dnsmasq more stable. Issue: FP2N-106 Change-Id: I3945aa1887612c6ecc4c69449e61211074ec69d2