tree 79b57de16f2b45bdfbeca90ae26e425fac57cdd4
parent 0a05126d69c9722521ab29847f75be52a56ada25
parent 467141c4d5488a1c9fd24d3684a2df9d287eb251
author Siqi Lin <siqilin@google.com> 1539117095 -0700
committer Siqi Lin <siqilin@google.com> 1539117116 -0700

Merge branch 'android-msm-bullhead-3.10-security-next' into android-msm-bullhead-3.10

December 2018.1

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