Conley Owens 5e3357fcee Merge commit '5eb49e0f' into m ...

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

Change-Id: Idc9c84c2ca7dec2540ceccead7927fddb912ff12

2011-05-02 09:59:30 -07:00

..

internal

Merge commit '5eb49e0f' into m

2011-05-02 09:59:30 -07:00

server

…