summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Patrick Baumann <patb@google.com> 2020-07-24 21:25:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-24 21:25:10 +0000
commit77fc95d036e7be2c0254ab9b5ddf93cc401197cb (patch)
tree90c9fab68609177d1e954eca5daf5c30fe4e7612 /libs/androidfw/AttributeResolution.cpp
parentb314222fe426af0d832afbfbe1ab240f75333067 (diff)
parentca45c2bf49eed26f597b51ee762bb981bf5cf950 (diff)
Merge "Fix unintended preferred activity reset" into rvc-dev am: 69b18e57fc am: a08113255b am: ca45c2bf49
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12220605 Change-Id: Ib594d7df0b524e1798278d068de9cb0d7c17425a
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions