Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE
Change-Id: I5f7a18f535eb0f027e87ab78b532cbf97cc7427f
diff --git a/src/proxy_resolver_v8.cc b/src/proxy_resolver_v8.cc
index 3820e7c..4867183 100644
--- a/src/proxy_resolver_v8.cc
+++ b/src/proxy_resolver_v8.cc
@@ -499,7 +499,7 @@
void PurgeMemory() {
v8::Locker locked(isolate_);
v8::Isolate::Scope isolate_scope(isolate_);
- v8::V8::LowMemoryNotification();
+ isolate_->LowMemoryNotification();
}
private:
@@ -709,7 +709,7 @@
ProxyErrorListener* error_listener)
: context_(NULL), js_bindings_(custom_js_bindings),
error_listener_(error_listener) {
-
+ v8::V8::Initialize();
}
ProxyResolverV8::~ProxyResolverV8() {