summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-09-04 13:08:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-09-04 13:08:54 +0000
commitb8d140375c068ed3010e1abc9e607bccd15efbc3 (patch)
treebee7682b401932290b0a8affa3cc0dc1a12c099b /libs/androidfw/AttributeResolution.cpp
parentc0f911ce35b6ca91e4073855b4944f904ba5559f (diff)
parentc17566dbd30fb854e7bcccc0f01821b040f88852 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a6dc548d57 -s ours am: c17566dbd3 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419721 Change-Id: I932e1f79010f28ff15ebedebe6e6f7bd10f24b9b
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions