Merge "[ProcessStas] fix index out of bounds when add duration."

author Olawale Ogunwale <ogunwale@google.com>

Mon, 6 Apr 2015 15:23:29 +0000 (15:23 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Mon, 6 Apr 2015 15:23:30 +0000 (15:23 +0000)
author Olawale Ogunwale <ogunwale@google.com>
Mon, 6 Apr 2015 15:23:29 +0000 (15:23 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 6 Apr 2015 15:23:30 +0000 (15:23 +0000)
diff --cc services/core/java/com/android/server/am/ProcessRecord.java
Simple merge
author	Olawale Ogunwale <ogunwale@google.com>
	Mon, 6 Apr 2015 15:23:29 +0000 (15:23 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 6 Apr 2015 15:23:30 +0000 (15:23 +0000)