OSDN Git Service

Merge changes I561c198c,Id4865f3c into jb-mr1-dev
authorMathias Agopian <mathias@google.com>
Wed, 19 Sep 2012 23:26:30 +0000 (16:26 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 19 Sep 2012 23:26:31 +0000 (16:26 -0700)
commit3a24e8f160c7794f44ef9fd5c70a61ff62412717
treeaabb6c1868ec93e79d6a6c6c143f2a3a631a47a5
parentd56eff2f49e64bb71863ffb866af8c3f686b96e9
parent787ac1b388f144f5e6dd38f8b807866a5256dafc
Merge changes I561c198c,Id4865f3c into jb-mr1-dev

* changes:
  improve sensor battery usage tracking
  track UID with connections