summaryrefslogtreecommitdiff
path: root/libs/androidfw/tests
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-11 23:26:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-11 23:26:19 +0000
commit7cd9daebb1fc8636014ca030de361165b543e926 (patch)
tree22b1a5d1eb9ca91dcedd70c4a18163ec2fc8afc2 /libs/androidfw/tests
parentebf6810cff6a9d460929c354a4a7b9e9a5ad2897 (diff)
parent2593e104d5cf829b2aa7a715530bebd63b3dc991 (diff)
Merge "Merge "Remove String16 operator<<, now provided in header" am: 35d04c27ee am: f1e6950510" into qt-qpr1-dev-plus-aosp am: 2593e104d5
Change-Id: I5cc3034b3d8ad29a3244ab436325f1f6a5cf243c
Diffstat (limited to 'libs/androidfw/tests')
-rw-r--r--libs/androidfw/tests/CommonHelpers.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/libs/androidfw/tests/CommonHelpers.h b/libs/androidfw/tests/CommonHelpers.h
index c160fbba4c01..8af13f20fb0d 100644
--- a/libs/androidfw/tests/CommonHelpers.h
+++ b/libs/androidfw/tests/CommonHelpers.h
@@ -44,10 +44,6 @@ static inline ::std::ostream& operator<<(::std::ostream& out, const String8& str
return out << str.string();
}
-static inline ::std::ostream& operator<<(::std::ostream& out, const String16& str) {
- return out << String8(str).string();
-}
-
static inline ::std::ostream& operator<<(::std::ostream& out, const ResTable_config& c) {
return out << c.toString();
}