Merge "Don't show icons for top level menus unless forced." into nyc-dev

author Oren Blasberg <orenb@google.com>

Tue, 26 Apr 2016 22:38:56 +0000 (22:38 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 26 Apr 2016 22:38:58 +0000 (22:38 +0000)
author Oren Blasberg <orenb@google.com>
Tue, 26 Apr 2016 22:38:56 +0000 (22:38 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 26 Apr 2016 22:38:58 +0000 (22:38 +0000)
diff --cc core/java/com/android/internal/view/menu/CascadingMenuPopup.java
Simple merge
author	Oren Blasberg <orenb@google.com>
	Tue, 26 Apr 2016 22:38:56 +0000 (22:38 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 26 Apr 2016 22:38:58 +0000 (22:38 +0000)