| commit | aa90295d200e29d2861be0c6d05829ca7f6c7592 | [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 | 836c2cbf5fdb0fc7a505f0fe867f0f6b9561ae63 | |
| parent | 0324a95052a5696ef4bb1176fcbda2b9cabbed78 [diff] | |
| parent | caa3abd3d18a201381457a8747e44126a7fbbf07 [diff] |
am deca2a04: (-s ours) Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev * commit 'deca2a041d13846158b0db92781b352ab473d9bc': (DO NOT MERGE) Battery monitoring fixes: