commit | f3e6e9a54583b710d9c76da5f1a17bd79e881ba9 | [log] [tgz] |
---|---|---|
author | Petri Gynther <pgynther@google.com> | Mon May 20 20:52:23 2019 -0700 |
committer | Petri Gynther <pgynther@google.com> | Mon May 20 20:53:37 2019 -0700 |
tree | 5e3dd59332b72e50e914d53ea7e8a5446884c910 | |
parent | adeab47beed71e57e5134fef90df1529bdca1906 [diff] | |
parent | 0ba62d69fa36e3b5b93963a735c14e712552c794 [diff] |
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>