Merge "Revert commits related to wallpaper cropping" into nyc-dev

author Chong Zhang <chz@google.com>

Fri, 27 May 2016 21:08:40 +0000 (21:08 +0000)

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

Fri, 27 May 2016 21:08:41 +0000 (21:08 +0000)
author Chong Zhang <chz@google.com>
Fri, 27 May 2016 21:08:40 +0000 (21:08 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 27 May 2016 21:08:41 +0000 (21:08 +0000)
diff --cc services/core/java/com/android/server/wm/WindowStateAnimator.java
Simple merge
author	Chong Zhang <chz@google.com>
	Fri, 27 May 2016 21:08:40 +0000 (21:08 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 27 May 2016 21:08:41 +0000 (21:08 +0000)