summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Ganesh Olekar <olekarg@google.com> 2022-08-15 10:13:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-15 10:13:47 +0000
commit6bfd59aabf4161d11be6bdc8f67b4fa0aea7f215 (patch)
tree94e234bd92a1d237f18e5f1ec213ad3a982399de /libs/androidfw/ConfigDescription.cpp
parent62767d9c63012d5c80c500d0d3a1c8c0e83a07f6 (diff)
parent6732f3304ff070b8e3f2ee4f570f1ded621ff5a0 (diff)
[automerger skipped] [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc am: 0a761a9510 -s ours am: 6732f3304f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19622507 Change-Id: If3afaa8ec98a89c24b850e35699e0ce155629261 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions