Merge "Temporary enable Build#SERIAL"

author Svetoslav Ganov <svetoslavganov@google.com>

Wed, 16 Nov 2016 00:33:12 +0000 (00:33 +0000)

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

Wed, 16 Nov 2016 00:33:16 +0000 (00:33 +0000)
author Svetoslav Ganov <svetoslavganov@google.com>
Wed, 16 Nov 2016 00:33:12 +0000 (00:33 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 16 Nov 2016 00:33:16 +0000 (00:33 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Svetoslav Ganov <svetoslavganov@google.com>
	Wed, 16 Nov 2016 00:33:12 +0000 (00:33 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 16 Nov 2016 00:33:16 +0000 (00:33 +0000)