Merge "Revert "Base: Delete ostream<< with std::string*"" am: 7178e29c22 am: 3578488787

am: 29769551c0

Change-Id: I64a35d031068bc1e8f631cf19300f9694e5a240b

base/include/android-base/logging.h

@@ -438,14 +438,4 @@ class ScopedLogSeverity {
 }  // namespace base
 }  // namespace android
 
-namespace std {
-
-// Delete << with string* to avoid mistakes. The intention was most likely to print *string.
-// If you really want to print the pointer, consider static_cast<void*>.
-//
-// Note: for this to work, we need to have this in a namespace.
-std::ostream& operator<<(std::ostream& stream, const std::string* string_pointer) = delete;
-
-}  // namespace std
-
 #endif  // ANDROID_BASE_LOGGING_H