summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceUtils.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-10-16 19:54:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-10-16 19:54:00 +0000
commit77921064d58a19422d298fad2ccbfb80200fd135 (patch)
tree62e89bf70f22a6cf82b355c20208cc19c46b43f8 /libs/androidfw/ResourceUtils.cpp
parentfa4fe98e0e7dcf3c59d5756420736194ec032204 (diff)
parent93a785bd6b25ba2c5f58c5624e68fbdfcb5b519f (diff)
Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays""" into rvc-dev am: 8b1151e4d5 am: 2f7396440e am: 93a785bd6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12816011 Change-Id: Iadfbf134bdc348c48a0d7ef98277925458b72d9a
Diffstat (limited to 'libs/androidfw/ResourceUtils.cpp')
0 files changed, 0 insertions, 0 deletions