| commit | 5e3357fcee2a23a08434873a89e8ada4c6e6d893 | [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 | 109657346b7248e970f65d1c50092b8b5a5ad50a | |
| parent | f0cae1a3f0243f176fbaa4f708e03141121876d0 [diff] | |
| parent | 5eb49e0f1e8e03e8808d8d7da6d5ffb761400e0b [diff] |
Merge commit '5eb49e0f' into m Conflicts: core/java/com/android/internal/os/BatteryStatsImpl.java Change-Id: Idc9c84c2ca7dec2540ceccead7927fddb912ff12