| commit | 0de87126892e03146cf68b204056c48c45aec7a6 | [log] [tgz] |
|---|---|---|
| author | Wei Wang <wvw@google.com> | Tue Jan 16 18:47:29 2018 -0800 |
| committer | Wei Wang <wvw@google.com> | Wed Jan 17 18:16:43 2018 +0000 |
| tree | e70d8cb90f73035120b5b260c24a08d2bf93ca7f | |
| parent | 290ebe32611620611bc995aa4bcbe007fa1fbe7f [diff] | |
| parent | 1d9eca18de75307e09565a86126b0910b8bc901b [diff] |
Merge branch 'android-msm-marlin-3.18-oc-mr1-security-next' into android-msm-marlin-3.18-oc-mr1 March 2018.2 Bug: 72042274 Change-Id: Ibdf51d841a19daee70589df6d9ba4a5492fac9e2