| commit | 4604ddc7318e02fc0c2d62d2be87ad4759a6fd7c | [log] [tgz] |
|---|---|---|
| author | Andrew Lehmer <alehmer@google.com> | Tue Aug 15 06:55:17 2017 -0700 |
| committer | Andrew Lehmer <alehmer@google.com> | Tue Aug 15 06:55:17 2017 -0700 |
| tree | f1ee25f679c8d9f95be4f02d585d34d520d68f3a | |
| parent | 2def3b3a085bf04865593adc03597d8efffde5d4 [diff] | |
| parent | 775ad4d1651e7c525c44e4afd8f6ef39a233d157 [diff] |
Merge branch 'android-msm-shamu-3.10-security-next' into android-msm-shamu-3.10 October 2017.1 Bug: 64693857 Change-Id: Ic46e7782900406b7920414e24dd0ca40094c28fd Signed-off-by: Andrew Lehmer <alehmer@google.com>