| commit | ead41e3b4f811cf31ec69cd825c412825d66f380 | [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 | 6d5d7b3f684f44b8fe4b66e7a41ab2c85084b588 [diff] | |
| parent | f2e8cb7d7dae8be5fdd3b4965697613fd526c299 [diff] |
am f2e8cb7d: resolved conflicts for merge of d4bdb7df to mnc-dev-plus-aosp * commit 'f2e8cb7d7dae8be5fdd3b4965697613fd526c299': logd: deal with sloppy leading expire messages