| commit | f98113a84ebad021454c5dca273eef939d67df02 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Wed May 13 17:20:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 13 17:20:46 2015 +0000 |
| tree | 0af811b5328e8e34e1b90e3461573dea0406ec13 | |
| parent | 1bea0793bbc1707bc0e035b7a3cc10a6ce1b393b [diff] | |
| parent | 3e4fd64307a66941a36718df7ab5fa04e093f10f [diff] |
am bb50775b: resolved conflicts for merge of a1aacb71 to mnc-dev-plus-aosp * commit 'bb50775b6d82112b937375a45a5a317e1afa8784': logd: Add klogd