Merge "Add fileds to AppCrash and ANR atoms" into pi-dev

author Chenjie Yu <cjyu@google.com>

Tue, 3 Apr 2018 05:00:21 +0000 (22:00 -0700)

committer android-build-merger <android-build-merger@google.com>

Tue, 3 Apr 2018 05:00:21 +0000 (22:00 -0700)
author Chenjie Yu <cjyu@google.com>
Tue, 3 Apr 2018 05:00:21 +0000 (22:00 -0700)
committer android-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 05:00:21 +0000 (22:00 -0700)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Chenjie Yu <cjyu@google.com>
	Tue, 3 Apr 2018 05:00:21 +0000 (22:00 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 3 Apr 2018 05:00:21 +0000 (22:00 -0700)