OSDN Git Service

Merge commit '5eb49e0f' into m
authorConley Owens <cco3@android.com>
Mon, 2 May 2011 16:59:30 +0000 (09:59 -0700)
committerConley Owens <cco3@android.com>
Mon, 2 May 2011 16:59:30 +0000 (09:59 -0700)
commit96780f4ce5dac8e6c2b1188dc18de0ba39bb50d1
tree3f4ae29dd568b69be2cb8dc2fc97ea9044960543
parentaa2f34f478b7f8a2baa47d8e44a198032faf4dd8
parentd3241ca3fa2b4714e8c7db53abb5029398aa362b
Merge commit '5eb49e0f' into m

Conflicts:
core/java/com/android/internal/os/BatteryStatsImpl.java

Change-Id: Idc9c84c2ca7dec2540ceccead7927fddb912ff12