From b8440110465cf2c0071e3b838cdb02d5a21fd2a9 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Mon, 12 Sep 2011 19:14:11 -0700
Subject: [PATCH] Fix bug 5296851 - Silly monkeys.

Change-Id: Idae81d426051c2e1b00a1d1b62b505effd0a2a68
---
 core/java/com/android/internal/widget/ActionBarView.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index 7434df3a9bd0..bbecb6c89af4 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -268,8 +268,10 @@ public class ActionBarView extends AbsActionBarView {
 
         if (mTabScrollView != null && mIncludeTabs) {
             ViewGroup.LayoutParams lp = mTabScrollView.getLayoutParams();
-            lp.width = LayoutParams.WRAP_CONTENT;
-            lp.height = LayoutParams.MATCH_PARENT;
+            if (lp != null) {
+                lp.width = LayoutParams.WRAP_CONTENT;
+                lp.height = LayoutParams.MATCH_PARENT;
+            }
             mTabScrollView.setAllowCollapse(true);
         }
     }
-- 
2.11.0