diff options
| author | 2020-12-07 21:01:44 +0000 | |
|---|---|---|
| committer | 2020-12-07 21:01:44 +0000 | |
| commit | f5b24b7a300d8baac333231a1f640412e604801e (patch) | |
| tree | 45600e61a51598fd9c7b87924557676cce9a1554 /libs/androidfw/AttributeResolution.cpp | |
| parent | 7960aa5d27b715a77082d837149f5d5fd33d0089 (diff) | |
| parent | 300a7b9d8a5991346c776d5d0dcc6cab322ad11a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ed6863d814 -s ours am: 300a7b9d8a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13176777
Change-Id: I5b4f2b5de4cb448ccd93e470bb5e50b32065134c
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions