Merge "Reduce jank during pinned stack animation" into nyc-dev

author Wale Ogunwale <ogunwale@google.com>

Wed, 10 Feb 2016 00:11:10 +0000 (00:11 +0000)

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

Wed, 10 Feb 2016 00:11:11 +0000 (00:11 +0000)
author Wale Ogunwale <ogunwale@google.com>
Wed, 10 Feb 2016 00:11:10 +0000 (00:11 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 10 Feb 2016 00:11:11 +0000 (00:11 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Wale Ogunwale <ogunwale@google.com>
	Wed, 10 Feb 2016 00:11:10 +0000 (00:11 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 10 Feb 2016 00:11:11 +0000 (00:11 +0000)