tree 7b0dd0025902a8cb1e29d5e1d23b7d2e653cc270
parent 3954e65171d62decc7207bb0115aa5c8b6bef093
parent b1922e640f9031a266b61ff96af3981c84eefef9
author Jason Monk <jmonk@google.com> 1523628250 -0700
committer android-build-merger <android-build-merger@google.com> 1523628250 -0700

Merge "Protect slice permissions text" into pi-dev am: e791b67448
am: b1922e640f

Change-Id: Ifb56bd57e49406a4ffe251067e1be46518ead8f9