| commit | 3cb433ee7db0b2534bd0ae64c338f650730bb559 | [log] [tgz] |
|---|---|---|
| author | Andrew Appleby <andrewa@fairphone.com> | Tue May 22 13:54:37 2018 +0200 |
| committer | Maarten Derks <maarten@fairphone.com> | Wed May 23 17:08:14 2018 +0000 |
| tree | 479c43cd53eeb9f8118f1fe18672ab6dc9dbc97c | |
| parent | aa3ee266cf7b6835693a78d0cde6ac10dd5d6600 [diff] | |
| parent | 634904d4fd2579b9315c67c27655b9e2b646c600 [diff] |
Merge the 2018-05-05 SPL branch from AOSP-Partner into android-7.1.2_r36 * origin/security-aosp-nyc-mr2-release: 37742976 - Catch bad gifs Issue: FP2N-106 Change-Id: Idad084944b53e1b2982e1475706b84c41f644f27