| commit | be1fc2cef134dab35d6a64ec40a1d4521bbbd247 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Jun 02 14:23:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 02 14:23:50 2015 +0000 |
| tree | a667bac328d13ab2099247793b86f820e213619d | |
| parent | 4fa48ff4418b9697a13c621e42c316986fdc4391 [diff] | |
| parent | 0882e4f63714365f72610d299c2412ab15b38b9c [diff] |
am f2e8cb7d: resolved conflicts for merge of d4bdb7df to mnc-dev-plus-aosp * commit 'f2e8cb7d7dae8be5fdd3b4965697613fd526c299': logd: deal with sloppy leading expire messages