tree 1e33377e614c80a3a4c1b23359e6d62a8ac4bc92
parent 564f12ebe409bead467eee04dfd719e97367e520
parent 32de2f67ea8276086ae91cbda1d0ef06caf4b3cb
author Dianne Hackborn <hackbod@google.com> 1299714444 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1299714444 -0800

Merge "Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1