Merge "Fix potential crash when per-procstate cpu times tracking is turned on."

author Sudheer Shanka <sudheersai@google.com>

Wed, 18 Jul 2018 05:03:12 +0000 (05:03 +0000)

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

Wed, 18 Jul 2018 05:03:12 +0000 (05:03 +0000)
author Sudheer Shanka <sudheersai@google.com>
Wed, 18 Jul 2018 05:03:12 +0000 (05:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 18 Jul 2018 05:03:12 +0000 (05:03 +0000)
diff --cc core/java/com/android/internal/os/BatteryStatsImpl.java
Simple merge
author	Sudheer Shanka <sudheersai@google.com>
	Wed, 18 Jul 2018 05:03:12 +0000 (05:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 18 Jul 2018 05:03:12 +0000 (05:03 +0000)