| commit | c7ebca13933a17c7e57f3462722aab674d5b1d61 | [log] [tgz] |
|---|---|---|
| author | Andrew Lehmer <alehmer@google.com> | Tue Aug 15 14:59:07 2017 -0700 |
| committer | Andrew Lehmer <alehmer@google.com> | Tue Aug 15 14:59:34 2017 -0700 |
| tree | 0cef8757de0244fee7890820d3c70b6c1891659f | |
| parent | 4604ddc7318e02fc0c2d62d2be87ad4759a6fd7c [diff] | |
| parent | a93f059eef8f4b8de662e307baf37ec15000ab92 [diff] |
Merge branch 'android-msm-shamu-3.10-security-next' into android-msm-shamu-3.10 October 2017.2 Bug: 64693857 Change-Id: I6687d3557a75907c931066619565930eedaec6d3 Signed-off-by: Andrew Lehmer <alehmer@google.com>