| commit | 44983ace850dd47384fa7698c362b4cfc9ca7f4c | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Mon Mar 24 19:36:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 24 19:36:32 2014 +0000 |
| tree | bbaf9d3da9d87d08d977fd463b888f054fd5daa7 | |
| parent | 978786e8b79f1178307b7211938db51414a19f63 [diff] | |
| parent | 68b9d5f07a443b44d81e09f65a45fea8c8f4984b [diff] |
am 68b9d5f0: am bdef5499: resolved conflicts for merge of f8f0531b to klp-modular-dev-plus-aosp * commit '68b9d5f07a443b44d81e09f65a45fea8c8f4984b': logd: core requirement