summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2022-07-06 06:03:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-06 06:03:13 +0000
commit83b5f8bdc1e0c118150202a242d57af44b66aeec (patch)
tree96309847c414960c22524b750cb7efb1d637c7f3 /libs/androidfw/AttributeResolution.cpp
parent734a418fdce43394d1e2cff4cb3145c3882856ae (diff)
parent0f5f012cccd3a8bab69d08a8082f22596f62c53d (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 75a7e3f8b1 -s ours am: 0f5f012ccc -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19168912 Change-Id: I926622ac3f13075eae14e1c206dd4a1f5d033b10 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions