diff options
| author | 2018-01-26 01:36:54 +0000 | |
|---|---|---|
| committer | 2018-01-26 01:36:54 +0000 | |
| commit | 38e839a23a8d9fa2ea361768087a2e7bb89f8bc4 (patch) | |
| tree | f7ec797ba38ef447d4e19971909d664809c2526f /libs/androidfw/AttributeResolution.cpp | |
| parent | 5f06c2ff15529d67df61b1b565bd256c75d8b0fd (diff) | |
| parent | 4032a0d2859706aab56e8c32e6c27b4be0be132e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 407d338837 -s ours skipped: 6ad3912399 am: 7e0d93a69b -s ours am: dba446b7a3 -s ours am: fd1f0742b7 -s ours
am: 4032a0d285 -s ours
Change-Id: I80ec7f81a429e037f36e46cea7d4ae9a8f005af2
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions