diff options
| author | 2020-09-03 10:38:16 +0000 | |
|---|---|---|
| committer | 2020-09-03 10:38:16 +0000 | |
| commit | e4321e73593325c89fdf9b8b82ab12d190d1c5ce (patch) | |
| tree | c0b93d439cb39b9eb973b3144b23658ed8f96137 /libs/androidfw/AttributeResolution.cpp | |
| parent | 0b43c0f70e617d30fa3cb54430764716f277f04c (diff) | |
| parent | 2879daa6aa1967beedbfa1dfdd80a1fe29d343c6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e941db9ff2 -s ours am: 2879daa6aa -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513076
Change-Id: If9cf2c177903cc4c8d0564268570f7ad87a5421e
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions