diff options
| author | 2018-01-26 01:38:20 +0000 | |
|---|---|---|
| committer | 2018-01-26 01:38:20 +0000 | |
| commit | b8bbb9d903b7f8c850178a66d389ba87fa191e21 (patch) | |
| tree | f7ec797ba38ef447d4e19971909d664809c2526f /libs/androidfw/AttributeResolution.cpp | |
| parent | 38e839a23a8d9fa2ea361768087a2e7bb89f8bc4 (diff) | |
| parent | b2eb89daf5c909a88a66c8ac42ef6cccc2e2dfe7 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41ee2787b4 -s ours skipped: 705235ca51 am: e15cb623db -s ours am: 8289005e10 -s ours am: e158633931 -s ours
am: b2eb89daf5 -s ours
Change-Id: Iea7ed535f395da6ce821131e7b846b029b220526
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions