Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds."

author Ruchi Kandoi <kandoiruchi@google.com>

Tue, 14 Apr 2015 00:17:09 +0000 (00:17 +0000)

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

Tue, 14 Apr 2015 00:17:14 +0000 (00:17 +0000)
author Ruchi Kandoi <kandoiruchi@google.com>
Tue, 14 Apr 2015 00:17:09 +0000 (00:17 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 14 Apr 2015 00:17:14 +0000 (00:17 +0000)
diff --cc core/java/com/android/internal/os/PowerProfile.java
Simple merge
author	Ruchi Kandoi <kandoiruchi@google.com>
	Tue, 14 Apr 2015 00:17:09 +0000 (00:17 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 14 Apr 2015 00:17:14 +0000 (00:17 +0000)