summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-08-10 12:37:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 12:37:47 +0000
commite2fa32a040fc7fc867cebb0187705f72dd31413f (patch)
treeab28799b10760986ddead18e068bb7da199c958d /libs/androidfw/ResourceTimer.cpp
parent4026b09cc47bf82c32b3af3c0e802baeb28bd7e1 (diff)
parent3a5d7358d57f96186806a719afb7db5cadcce6bb (diff)
[automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into rvc-dev am: 69e4884a10 am: 97341f2b60 -s ours am: 84402c0922 -s ours am: cd1db8eb78 -s ours am: 930a13a99a -s ours am: 163f7fc228 -s ours am: e1f08e4283 -s ours am: 3a5d7358d5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537950 Change-Id: Ied5c7f0a456703d488fe6ad318e50c994368a010 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions