Merge "BatteryStats: Fix issue where network traffic accounting might be lost" into...

author Adam Lesinski <adamlesinski@google.com>

Sat, 27 Feb 2016 00:15:09 +0000 (00:15 +0000)

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

Sat, 27 Feb 2016 00:15:11 +0000 (00:15 +0000)
author Adam Lesinski <adamlesinski@google.com>
Sat, 27 Feb 2016 00:15:09 +0000 (00:15 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 27 Feb 2016 00:15:11 +0000 (00:15 +0000)
diff --cc core/java/com/android/internal/os/BatteryStatsImpl.java
Simple merge
author	Adam Lesinski <adamlesinski@google.com>
	Sat, 27 Feb 2016 00:15:09 +0000 (00:15 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 27 Feb 2016 00:15:11 +0000 (00:15 +0000)