| commit | 11a6ddbb6e8bdab1f6c0a4f8b3779e30e6be78f2 | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Wed Aug 06 01:14:28 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 05 00:15:52 2014 +0000 |
| tree | 72396453c1403d6cd41bd79ee7bb7b7f44b413d4 | |
| parent | d3541e5b86e4b367dc2a1dd035f79ed24a9a881b [diff] | |
| parent | 1dcedbac347a363f77bc7d4818a7da6aefd4d9f4 [diff] |
Merge "Fall-through for ActionModes with ToolbarActionBar" into lmp-dev
diff --git a/core/java/com/android/internal/app/ToolbarActionBar.java b/core/java/com/android/internal/app/ToolbarActionBar.java index 298dd44..96d7192 100644 --- a/core/java/com/android/internal/app/ToolbarActionBar.java +++ b/core/java/com/android/internal/app/ToolbarActionBar.java
@@ -179,7 +179,7 @@ @Override public ActionMode startActionMode(ActionMode.Callback callback) { - return mToolbar.startActionMode(callback); + return null; } @Override