| commit | 91a2acf27c31ecf2af539e9c386779363739f8e6 | [log] [tgz] |
|---|---|---|
| author | Daniel Mentz <danielmentz@google.com> | Thu May 10 13:52:21 2018 -0700 |
| committer | Daniel Mentz <danielmentz@google.com> | Thu May 10 13:52:34 2018 -0700 |
| tree | 20ea193d8b4a41608d5e5d602f2cb511460edac6 | |
| parent | f4f23f24b71a93cbab7153cf9c56d31e73824789 [diff] | |
| parent | d244684a28c4aaf2efa6f2aba8ee17dba213c551 [diff] |
Merge branch 'android-msm-marlin-3.18-oc-mr1-security-next' into android-msm-marlin-3.18-oc-mr1 July 2018.1 Bug: 79365489 Change-Id: I5d8a5434e5d878f5c420bfc97c8805f94119a791 Signed-off-by: Daniel Mentz <danielmentz@google.com>