commit ec200415f587f6739990056c8e2eb2c1e42eded9
author Clara Bayarri <clarabayarri@google.com> Tue May 17 09:20:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 17 09:20:43 2016 +0000
tree 980cc5e89aa00e1ab329cf9fdfb4b6042bea0735
parent 4803983717442b1099b9679b3b0d822cb8511509
parent bee26480277234cb599a7131cd24ce3c5108e474

Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev
am: bee2648027

* commit 'bee26480277234cb599a7131cd24ce3c5108e474':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: I2efdcb8828da9a455dc80911c3aa87ac7ec6eab5

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index fecfdae..59edc8c 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1688,7 +1688,7 @@
     }
 
     /**
-     * Request the Keyboard Shortcuts screen to show up. If it succeeds, this will trigger
+     * Request the Keyboard Shortcuts screen to show up. This will trigger
      * {@link #onProvideKeyboardShortcuts} to retrieve the shortcuts for the foreground activity.
      */
     public final void requestShowKeyboardShortcuts() {