tree 76a6fd1d3eb317669a3acdf26752f5635d1ed7bf
parent 0b570a88eb70d67aed2112c40c4225b35a992dea
parent 2642c1fd82af2396826d12dc0098021b55d15ac8
author Oleg Matcovschi <omatcovschi@google.com> 1521004785 -0700
committer Siyuan Zhou <siyuanzhou@google.com> 1521048853 +0000

Merge android-msm-marlin-3.18-oc-mr1-security-next into android-msm-marlin-3.18-oc-mr1

April 2018.2

Bug: 73498666

Change-Id: Id6c61080eabaa3690c688a64c62f5ee685e3a73f
Signed-Off-By: Oleg Matcovschi <omatcovschi@google.com>