tree a0fe545295e28aae5367faf28184cde89df92eae
parent c1f2a89bb262d63d3c16bb51be06de30d9212ae3
parent 918fb6988403315143849d0ff65e2796d61ad688
author Karsten Tausche <karsten@fairphone.com> 1534323415 +0200
committer Karsten Tausche <karsten@fairphone.com> 1534323415 +0200

Merge the 2018-09-05 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  RESTRICT AUTOMERGE: Always use safe labels

Change-Id: Ic730e65400dd1e9dbaacdacd86c35d2889582c55