commit 06ad2393459b58adf6e8bb03327f5ef3f48c6e7a
author Calin Juravle <calin@google.com> Wed Oct 29 20:43:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 29 20:43:31 2014 +0000
tree 2b58740de32ad1eaab5d4e546c0c089f8f0c7b73
parent 1dde8874a476d3057a7ddf192ac278c092e3464a
parent 792e2691276ffac5538e905b7fa8e9607b554283

am 792e2691: resolved conflicts for merge of 7a1abfe3 to lmp-mr1-dev-plus-aosp

* commit '792e2691276ffac5538e905b7fa8e9607b554283':
  Add code cache tests to libnativebridge.

libnativebridge/tests/CompleteFlow_test.cpp

diff --git a/libnativebridge/tests/CompleteFlow_test.cpp b/libnativebridge/tests/CompleteFlow_test.cpp
index 05f5304..b033792 100644
--- a/libnativebridge/tests/CompleteFlow_test.cpp
+++ b/libnativebridge/tests/CompleteFlow_test.cpp
@@ -42,8 +42,6 @@
 
     // Clean-up code_cache
     ASSERT_EQ(0, rmdir(kCodeCache));
-
-    ASSERT_FALSE(NativeBridgeError());
 }
 
 }  // namespace android