tree b994cd149bc47ada7e49923a41319d02f3713d8a
parent cfdb7f6fd5686e057e68990f2e75a53a96a45e11
parent 78fa0bd3ccb145c2986cefab10fd830427026fcc
author Siqi Lin <siqilin@google.com> 1539118442 -0700
committer Siqi Lin <siqilin@google.com> 1539118464 -0700

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

December 2018.1

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