diff options
| author | Bill Yi <byi@google.com> | 2017-06-21 20:27:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-21 20:27:09 +0000 |
| commit | c10f9d81f849b883eb72663bb62d344ce70a3e1e (patch) | |
| tree | 9f3166bba85a10e703f793dab186a89215a3a211 /tools/aapt2/configuration/ConfigurationParser.cpp | |
| parent | c1a3600446ac1a3a68d4e531330876c8424eb484 (diff) | |
| parent | 3d423a513dc85985bf9b4c80a5300084f6d8faf2 (diff) | |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: d5a305068a -s ours
am: 3d423a513d -s ours
Change-Id: Ibd257f0e3a4379c5daff6d059a438b076a4f4b1a
Diffstat (limited to 'tools/aapt2/configuration/ConfigurationParser.cpp')
0 files changed, 0 insertions, 0 deletions