tree 78280994b164ffbccf66226ced54560e96d107f2
parent c7a82f3b16f645e9ca15fbb12cc64b0129f76682
parent 6bb25df2a75f64e7620aba74a906c4bb1fb41c2d
author PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> 1601674073 -0700
committer SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> 1601674073 -0700

Merge android-msm-floral-4.14-rvc-qpr1 into android-msm-pixel-4.14

SBMerger: 325904710
Change-Id: I3bdae4b40f6ba8fba8abb34ffc562e131c7eb11a
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>