diff options
author | Adam Vartanian <flooey@google.com> | 2018-02-01 10:02:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-01 10:02:43 +0000 |
commit | fea4158eeaa3f9a4533d7f1d684a60b34d53a46a (patch) | |
tree | b538339e12f7ae066b9a3eff66ef718e01982430 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e2417e6682cd6c33c5b9dc5d9cf7092de7afce13 (diff) | |
parent | fddbf1b6b25792fe04c0c38977555079bc6c3bcb (diff) |
Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions