summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-08-12 20:13:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-12 20:13:15 +0000
commit92ee9816e984f140d18ac30671074eb9f2a48a81 (patch)
tree6992556eb678f341a6ac31433e0fcffdfe303adb /libs/androidfw/AttributeResolution.cpp
parent43b77b59a99c01bafd7ef6e81ead1b3fd3c40691 (diff)
parente37e191310671a552923ed297c21a09b4c0c30f6 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6d2bd0ab82 -s ours am: d95592f161 -s ours am: e37e191310 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19601519 Change-Id: I5a7270d653c70c0b7b2e429b8a540723e19cf0cb 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