summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Powell <adamp@google.com> 2014-08-06 01:14:28 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-08-05 00:15:52 +0000
commit11a6ddbb6e8bdab1f6c0a4f8b3779e30e6be78f2 (patch)
tree72396453c1403d6cd41bd79ee7bb7b7f44b413d4
parentd3541e5b86e4b367dc2a1dd035f79ed24a9a881b (diff)
parent1dcedbac347a363f77bc7d4818a7da6aefd4d9f4 (diff)
Merge "Fall-through for ActionModes with ToolbarActionBar" into lmp-dev
-rw-r--r--core/java/com/android/internal/app/ToolbarActionBar.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/ToolbarActionBar.java b/core/java/com/android/internal/app/ToolbarActionBar.java
index 298dd44557c6..96d7192dcf36 100644
--- a/core/java/com/android/internal/app/ToolbarActionBar.java
+++ b/core/java/com/android/internal/app/ToolbarActionBar.java
@@ -179,7 +179,7 @@ public class ToolbarActionBar extends ActionBar {
@Override
public ActionMode startActionMode(ActionMode.Callback callback) {
- return mToolbar.startActionMode(callback);
+ return null;
}
@Override