| commit | 02779b44ae3155b45fda4f8305ab26d9cb83ced8 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Sep 01 20:53:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 20:53:57 2015 +0000 |
| tree | ad8da0f63f133fae9e3b3ce6691dddb33f43d5d6 | |
| parent | ff16f2b19900e81e0adf2e76efedd2a8d29fc9c6 [diff] | |
| parent | 65ea572b6a712109be4083044be6c285b622e949 [diff] |
am a5ce1a6f: resolved conflicts for merge of b2205bc7 to mnc-dr-dev-plus-aosp * commit 'a5ce1a6fb0a8a5ac0233ffabef7e67ae44756bc7': healthd: logd: add timestamp to kernel logged battery messages