Merge "Add a NOLINT for the memory leak we added" am: 10f62351eb

am: 4e3ae2cbfa

Change-Id: I32d7a736428f38c68ccf90947841732eaae4c224

adb/client/main.cpp

@@ -77,6 +77,7 @@ void adb_server_cleanup() {
 
 static void intentionally_leak() {
     void* p = ::operator new(1);
+    // The analyzer is upset about this leaking. NOLINTNEXTLINE
     LOG(INFO) << "leaking pointer " << p;
 }