tree 43815a6febe0640c177244250dbe541df6f56f7a
parent a27f289f5b7a7b28c5827beeba34f11cc99f08d3
parent 76be981024d057b73798371608efa3d5c1f89780
author Siyuan Zhou <siyuanzhou@google.com> 1521000668 -0700
committer Siyuan Zhou <siyuanzhou@google.com> 1521001654 +0000

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

April 2018.2

Bug: 73499097
Bug: 74613955

Signed-off-by: Siyuan Zhou <siyuanzhou@google.com>
Change-Id: I64a0f16c6819803ffdd19ecc1d6fd12c3b97f72a