commit 2f44d1350930cbd751794cbe15c94c17feb0ac57
author Michael Kolb <kolby@google.com> Mon May 14 19:34:22 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 14 19:34:22 2012 -0700
tree 1f817ef92ecdf6becc66701d3db29d82a7d2ceda
parent 61c6bb6346f8f4db09fe92a95dd4dad822c3c0ff
parent 2b552f5154fb582ddfd3296eaa8ec35675edb613

am 2b552f51: Monkey proofing

* commit '2b552f5154fb582ddfd3296eaa8ec35675edb613':
  Monkey proofing

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