Merge "Allow at most one pinned stack task." into oc-dev

author Bryce Lee <brycelee@google.com>

Tue, 18 Apr 2017 21:30:58 +0000 (21:30 +0000)

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

Tue, 18 Apr 2017 21:31:04 +0000 (21:31 +0000)
author Bryce Lee <brycelee@google.com>
Tue, 18 Apr 2017 21:30:58 +0000 (21:30 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 18 Apr 2017 21:31:04 +0000 (21:31 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge
author	Bryce Lee <brycelee@google.com>
	Tue, 18 Apr 2017 21:30:58 +0000 (21:30 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 18 Apr 2017 21:31:04 +0000 (21:31 +0000)