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

Change-Id: Ie5db9f745e01bd24faa317af0cd8874e1099ebdf
This commit is contained in:
Calin Juravle 2014-10-29 19:51:04 +00:00
commit 792e269127

View file

@ -42,8 +42,6 @@ TEST_F(NativeBridgeTest, CompleteFlow) {
// Clean-up code_cache
ASSERT_EQ(0, rmdir(kCodeCache));
ASSERT_FALSE(NativeBridgeError());
}
} // namespace android