Merge "Correct PopupWindow spaceAbove calculation." into nyc-dev

author Rob Carr <racarr@google.com>

Wed, 13 Apr 2016 18:54:59 +0000 (18:54 +0000)

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

Wed, 13 Apr 2016 18:55:00 +0000 (18:55 +0000)
author Rob Carr <racarr@google.com>
Wed, 13 Apr 2016 18:54:59 +0000 (18:54 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 13 Apr 2016 18:55:00 +0000 (18:55 +0000)
diff --cc core/java/android/widget/PopupWindow.java
Simple merge
author	Rob Carr <racarr@google.com>
	Wed, 13 Apr 2016 18:54:59 +0000 (18:54 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 13 Apr 2016 18:55:00 +0000 (18:55 +0000)