diff options
| author | 2018-01-26 21:13:17 +0000 | |
|---|---|---|
| committer | 2018-01-26 21:13:17 +0000 | |
| commit | da312d3a444347f8226810039faea1f1ac099fcf (patch) | |
| tree | 6eabf8ba0608a0a5669a02e2b9e8fac368cba203 /libs/androidfw/AttributeResolution.cpp | |
| parent | 6ab6643d3e63496c84063a0cf6ec4e0a5daacfb4 (diff) | |
| parent | a2c154e0cd226e07a121ba54204bd8a3faabfda5 (diff) | |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: a2c154e0cd -s ours
Change-Id: Ic092382ce5846801335c5d23aa105bb372a044e4
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions