Merge "Make task fullscreen when locked" into nyc-dev

author Andrii Kulian <akulian@google.com>

Wed, 13 Apr 2016 18:00:34 +0000 (18:00 +0000)

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

Wed, 13 Apr 2016 18:00:36 +0000 (18:00 +0000)
author Andrii Kulian <akulian@google.com>
Wed, 13 Apr 2016 18:00:34 +0000 (18:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 13 Apr 2016 18:00:36 +0000 (18:00 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Andrii Kulian <akulian@google.com>
	Wed, 13 Apr 2016 18:00:34 +0000 (18:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 13 Apr 2016 18:00:36 +0000 (18:00 +0000)