resolved conflicts for merge of 7a1abfe3 to lmp-mr1-dev-plus-aosp

Change-Id: Ie5db9f745e01bd24faa317af0cd8874e1099ebdf

libnativebridge/tests/CompleteFlow_test.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -42,8 +42,6 @@ TEST_F(NativeBridgeTest, CompleteFlow) {

		// Clean-up code_cache
		ASSERT_EQ(0, rmdir(kCodeCache));

		ASSERT_FALSE(NativeBridgeError());
		}

		} // namespace android