am 4e8b237d: Merge "return false for media keys if no controller" into lmp-dev

* commit '4e8b237d6a97b7c97fded14005723e56c9bb8c19':
  return false for media keys if no controller

policy/src/com/android/internal/policy/impl/PhoneWindow.java

@@ -1729,6 +1729,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
                         return true;
                     }
                 }
+                return false;
             }
 
             case KeyEvent.KEYCODE_MENU: {
@@ -1822,6 +1823,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
                         return true;
                     }
                 }
+                return false;
             }
 
             case KeyEvent.KEYCODE_MENU: {