| commit | 891f2c29fe4bfc06747c0eb58fcf35a7fa05a588 | [log] [tgz] |
|---|---|---|
| author | Daniel Mentz <danielmentz@google.com> | Wed May 09 16:09:31 2018 -0700 |
| committer | Daniel Mentz <danielmentz@google.com> | Wed May 09 16:09:31 2018 -0700 |
| tree | 791abaf5ee37b15569b69ddcac583726e2694dd3 | |
| parent | 3c08788b8c7f7a667a9f0a0b756b600f2eb5e22a [diff] | |
| parent | f4f23f24b71a93cbab7153cf9c56d31e73824789 [diff] |
Merge branch 'android-msm-marlin-3.18-oc-mr1' into android-msm-marlin-3.18 Conflicts: include/crypto/internal/hash.h security/keys/request_key.c June 2018.1 Bug: 76445910 Change-Id: Ib5ff8dc1d4fa848f2d0e6f69831804b3fe915a5a