diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-10-20 17:31:00 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-20 17:31:00 +0000 |
commit | 5e66a4f5978d03c92b2c9cb59223d3fa538c93ab (patch) | |
tree | c1a0ba293be3496f2987a4c1a8bed4cd49e7e964 /tools/aapt2/io/StringInputStream_test.cpp | |
parent | 306910753e346ac115e1cec271f544dc5f08f556 (diff) | |
parent | e38f55d983401d34f417ab428263a311767cc80c (diff) |
Merge "Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f9cf2df461 -s ours am: 33b0f435de -s ours am: eed665acfd -s ours"
Diffstat (limited to 'tools/aapt2/io/StringInputStream_test.cpp')
0 files changed, 0 insertions, 0 deletions