| commit | 25427aacc57d9f8249f5fed0eba8ab7d7d6f564a | [log] [tgz] |
|---|---|---|
| author | Daniel Mentz <danielmentz@google.com> | Thu May 10 12:01:36 2018 -0700 |
| committer | Daniel Mentz <danielmentz@google.com> | Thu May 10 12:49:44 2018 -0700 |
| tree | 200aa856c987f6f8c398a32fa26384db8e7811de | |
| parent | 1b72a7fee7bfa92ea982b5ba6b2064e9370d4374 [diff] | |
| parent | 3a1525ec2f10feaa2855e91e848ea7f94b6f6943 [diff] |
Merge branch 'android-msm-wahoo-4.4-oc-mr1-security-next' into android-msm-wahoo-4.4-oc-mr1 July 2018.1 Bug: 79365593 Change-Id: I56d5e541338391a77763b643314825251afd40ef Signed-off-by: Daniel Mentz <danielmentz@google.com>