commit 89585a179c61300c2f0239975b190196ce9f23dc
author Eric Fischer <enf@google.com> Mon May 14 14:54:04 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 14 14:54:04 2012 -0700
tree 630913d8dacf9b25b0ad9f6de41b4fbf00ad150d
parent 2b552f5154fb582ddfd3296eaa8ec35675edb613
parent 5c9d9d73c796860660bc45c80d9b09d178bcbaf1

Merge "Import translations. DO NOT MERGE" into jb-dev

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index cb475b7..4bb8107 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -207,7 +207,7 @@
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        return mController.onCreateOptionsMenu(menu);
+        return (mController != null) && mController.onCreateOptionsMenu(menu);
     }
 
     @Override