tree ae79f7ed8c4d2447834ecb83545e1e92072010e6
parent e5028291ee6e274606c4233abb93b4fc24580a0f
parent 9cd51706e57bead0d8ebd37f5a9ea1b831139a21
author Francesco Salvatore <francesco@fairphone.com> 1548430583 +0100
committer Francesco Salvatore <francesco@fairphone.com> 1548952845 +0000

Merge the 2019-01-01 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Merge commit 'b760a3bb' into aug10d-nyc-mr2-dev

Change-Id: I3597b86fa20b733dccdc322cb76ed2d1bcf22f62