tree 731666bd26541ad0e4a66ca102cddbb29366e3c9
parent 5d46ef370eca42aa765174a5f899becd344e2fb4
parent 08c1dc2d66b13adfe0da5bc827a2e860d44be511
author Pinyao Ting <pinyaoting@google.com> 1567992877 -0700
committer android-build-merger <android-build-merger@google.com> 1567992877 -0700

[automerger skipped] fixes a security vulnerability in slice provider am: 46368e4f5c -s ours am: d16ceb6e8e -s ours am: 122636b4f5 -s ours
am: 08c1dc2d66 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 2b415a4c44 is in history

Change-Id: I971fd790e6541f7ccc62cc1ed40b261c42a9a43b