tree e39fc7add73e1451df140b1989d3b7f7a442f8d7
parent 340a9aaf92bcb84a79e51a07c03e05ef2f9ea812
parent e7c6d078d645602a9530313611e32c2350d2780b
author Siqi Lin <siqilin@google.com> 1536258029 -0700
committer Siqi Lin <siqilin@google.com> 1536258099 -0700

Merge branch 'android-msm-bluecross-4.9-pi-dr1-security-next' into android-msm-bluecross-4.9-pi-dr1

November 2018.1

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