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