tree 2668c5b0acf37eb9fa5a0f1c5a6ebdb83ed17303
parent d3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c
parent ce2ef766cad1bb186ea522f76c4ac6a8bb3dfa87
author Dianne Hackborn <hackbod@google.com> 1285025382 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1285025382 -0700

Merge "Some battery improvements:" into gingerbread