summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-04-04 00:27:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-04-04 00:27:27 +0000
commitf1851462b6f4700c5955a5f4b815fe2dbc908b43 (patch)
tree021fe12c87425a861e74b872faf5422d27881049 /libs/androidfw/AttributeResolution.cpp
parentf90b35ad6c564f958ecf1aa80bf7d822a870a57f (diff)
parent08c9aee1636741f5ccfc24b7b0418b50c08aab8c (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 08c9aee163 -s ours
am skip reason: subject contains skip directive Change-Id: I96ec76d9ca1f0122a1e9427a4d04a3c3c115b251
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions