tree c17d678180a4f2dc53a51e6cb866abae0b6bac94
parent 72babaee36d9474222305b972ca59018e6926686
parent bc59740fe42787e51fc9f1af26e5e77d17672860
author Pinyao Ting <pinyaoting@google.com> 1567640454 -0700
committer android-build-merger <android-build-merger@google.com> 1567640454 -0700

Merge "fixes a security vulnerability in slice provider" into qt-dev
am: bc59740fe4

Change-Id: Iba3a00da2706910d34cb53cc999047c16023cf93