commit | 96780f4ce5dac8e6c2b1188dc18de0ba39bb50d1 | [log] [tgz] |
---|---|---|
author | Conley Owens <cco3@android.com> | Mon May 02 09:59:30 2011 -0700 |
committer | Conley Owens <cco3@android.com> | Mon May 02 09:59:30 2011 -0700 |
tree | 3f4ae29dd568b69be2cb8dc2fc97ea9044960543 | |
parent | aa2f34f478b7f8a2baa47d8e44a198032faf4dd8 [diff] | |
parent | d3241ca3fa2b4714e8c7db53abb5029398aa362b [diff] |
Merge commit '5eb49e0f' into m Conflicts: core/java/com/android/internal/os/BatteryStatsImpl.java Change-Id: Idc9c84c2ca7dec2540ceccead7927fddb912ff12