commit | f1f6fc8a0994d72871779923825b2e72caf1062c | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Fri May 23 00:11:11 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 23 00:11:11 2014 +0000 |
tree | 13107af05a9873cc3d4ef92592183c92e2a0ab9d | |
parent | 72027d9ad7460ff5038422cda1d93ec79b2cedca [diff] | |
parent | e3526efe028d30a71af6397e91b9a9b2e0d67524 [diff] |
am deca2a04: (-s ours) Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev * commit 'deca2a041d13846158b0db92781b352ab473d9bc': (DO NOT MERGE) Battery monitoring fixes: