diff options
| author | 2017-01-05 10:12:01 +0000 | |
|---|---|---|
| committer | 2017-01-05 10:12:01 +0000 | |
| commit | c125e0ef17b247abf0c5dbb05c0cbddf6fe3e453 (patch) | |
| tree | 067f616e8acfd953ea66c404e6e7967ab00a07eb /libs/androidfw/AttributeResolution.cpp | |
| parent | 991dedc5cd599cb8dee05cc6cbe3077ea78fd7c3 (diff) | |
| parent | 9e8b15b953a7f9bacfc626b9797a5aa23a8212eb (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 9e8b15b953 -s ours
Change-Id: I815b7a16c8893727641bc724b06feccbb6ba30ad
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions