Merge "Clarify docs for PopupWindow width/height parameters" into nyc-dev

author Alan Viverette <alanv@google.com>

Thu, 23 Jun 2016 00:55:51 +0000 (00:55 +0000)

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

Thu, 23 Jun 2016 00:55:52 +0000 (00:55 +0000)
author Alan Viverette <alanv@google.com>
Thu, 23 Jun 2016 00:55:51 +0000 (00:55 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 23 Jun 2016 00:55:52 +0000 (00:55 +0000)
diff --cc core/java/android/widget/PopupWindow.java
Simple merge
author	Alan Viverette <alanv@google.com>
	Thu, 23 Jun 2016 00:55:51 +0000 (00:55 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 23 Jun 2016 00:55:52 +0000 (00:55 +0000)