tree f4acb592cb0895ba70127263fcc3203872e1811f
parent 2ab2a86ebd7c6876b08854447789bcee56510b72
parent 60e9f50edfe667fa017b2b7fe4f085bbb904eba7
author Siqi Lin <siqilin@google.com> 1539120246 -0700
committer Siqi Lin <siqilin@google.com> 1539120321 -0700

Merge branch 'android-msm-marlin-3.18-pi-security-next' into android-msm-marlin-3.18-pi

December 2018.1

Bug: 117289242
Change-Id: Iee2ccf94a318fa65aafe94d5c2c7b8a97e753a3a
Signed-off-by: Siqi Lin <siqilin@google.com>