summaryrefslogtreecommitdiff
path: root/tools/aapt2/io/StringInputStream_test.cpp
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2017-10-20 17:28:39 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-20 17:28:39 +0000
commite38f55d983401d34f417ab428263a311767cc80c (patch)
tree374ec31cb49cdf2d73e22d3b474ba0c417fb1ea3 /tools/aapt2/io/StringInputStream_test.cpp
parentb5def6df3173775a43733f55227b5cb371fd854f (diff)
parenteed665acfd9698b3622cf4c7355929b32e1fd15e (diff)
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f9cf2df461 -s ours am: 33b0f435de -s ours
am: eed665acfd -s ours Change-Id: Icdfc1004381d27021fd9ff5d9f257b575143f07f
Diffstat (limited to 'tools/aapt2/io/StringInputStream_test.cpp')
0 files changed, 0 insertions, 0 deletions