resolved conflicts for merge of d8435643 to lmp-mr1-dev-plus-aosp

Change-Id: Ic4669691dd50e400d79e1bc1e54d2e53bcd35a56

core/java/android/widget/PopupWindow.java

@@ -378,10 +378,10 @@ public class PopupWindow {
     }
 
     /**
-     * Set the flag on popup to ignore cheek press event; by default this flag
+     * Set the flag on popup to ignore cheek press events; by default this flag
      * is set to false
-     * which means the pop wont ignore cheek press dispatch events.
-     *
+     * which means the popup will not ignore cheek press dispatch events.
+     * 
      * <p>If the popup is showing, calling this method will take effect only
      * the next time the popup is shown or through a manual call to one of
      * the {@link #update()} methods.</p>