tree 5e3dd59332b72e50e914d53ea7e8a5446884c910
parent adeab47beed71e57e5134fef90df1529bdca1906
parent 0ba62d69fa36e3b5b93963a735c14e712552c794
author Petri Gynther <pgynther@google.com> 1558410743 -0700
committer Petri Gynther <pgynther@google.com> 1558410817 -0700

Merge android-msm-marlin-3.18-security-next into android-msm-marlin-3.18

No-op merge in order to fast-forward -security-next to match master.

Change-Id: I46ef4ca1f604aee93ece54871007b9e2fba8dc61
Signed-off-by: Petri Gynther <pgynther@google.com>