OSDN Git Service

Merge "Android OS battery usage overstated by screen on time" into ics-mr1
authorTodd Poynor <toddpoynor@google.com>
Thu, 5 Jan 2012 19:21:08 +0000 (11:21 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 5 Jan 2012 19:21:08 +0000 (11:21 -0800)

Trivial merge