Merge "AppErrors: Fix bad flags printing in dropbox crash reports" into nyc-mr1-dev

author Adrian Roos <roosa@google.com>

Tue, 19 Jul 2016 17:10:02 +0000 (17:10 +0000)

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

Tue, 19 Jul 2016 17:10:04 +0000 (17:10 +0000)
author Adrian Roos <roosa@google.com>
Tue, 19 Jul 2016 17:10:02 +0000 (17:10 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 19 Jul 2016 17:10:04 +0000 (17:10 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Adrian Roos <roosa@google.com>
	Tue, 19 Jul 2016 17:10:02 +0000 (17:10 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 19 Jul 2016 17:10:04 +0000 (17:10 +0000)