tree 33fdcd8989a4fb0ee2cd0e716eaebe4a1411f6e8
parent 25d4dc26ba5993c1cd53e1d47fdc22ffb6b0b035
parent 62450535d90e5b794b3d5b8d850272452106ef3e
author Siqi Lin <siqilin@google.com> 1500917136 -0700
committer Siqi Lin <siqilin@google.com> 1500917154 -0700

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

September 2017.2

Bug: 63174519
Change-Id: Ia1361c5864cdb431810e4a8f8e69df7b6d542e7e