| commit | 66491aea95d6ce5716bc8ae66253e6f93868c95a | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Mon Aug 24 16:58:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 16:58:43 2015 +0000 |
| tree | 4207e75ab62606d7cd3d66756b2600e66da9bc72 | |
| parent | 2eb2e2d96a82fe6bf4773b28abf98e8258a9e1f4 [diff] | |
| parent | 4b9c2c454ddc6b492a261266f21011dd4ba07feb [diff] |
am 992b01c7: resolved conflicts for merge of 77e27d8c to mnc-dr-dev-plus-aosp * commit '992b01c7e0d8af4c3aedbf49b5baf25e76755a04': logd: worst uid record watermark logd: log buffer switch to std::list logd: white and black switch to std::list logd: logtimes switch to std::list logd: prune 10% or 256 entries max logd: sizes > 1M prune in smaller batches