am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed

* commit 'cd5f3bab37ef1dc041489f53f565416d295916d9':
  Use the right layout for inflating Action Bar.

1 files changed, 11 insertions, 0 deletions

diff --git a/core/java/android/widget/Toolbar.java b/core/java/android/widget/Toolbar.java
index d4d186c..f90d64a 100644
--- a/core/java/android/widget/Toolbar.java
+++ b/core/java/android/widget/Toolbar.java
@@ -1752,6 +1752,17 @@ public class Toolbar extends ViewGroup {
     }
 
     /**
+     * Accessor to enable LayoutLib to get ActionMenuPresenter directly.
+     */
+    ActionMenuPresenter getOuterActionMenuPresenter() {
+        return mOuterActionMenuPresenter;
+    }
+
+    Context getPopupContext() {
+        return mPopupContext;
+    }
+
+    /**
      * Interface responsible for receiving menu item click events if the items themselves
      * do not have individual item click listeners.
      */