| commit | 68b9d5f07a443b44d81e09f65a45fea8c8f4984b | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Sat Mar 22 00:06:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 22 00:06:57 2014 +0000 |
| tree | f605d954e68fe161eeeaf643bd52169e34f8ce2a | |
| parent | 8096a0dd4c0f6d17e51726a69050c49a75cf098a [diff] | |
| parent | bdef5499d4eb0c4f5e6853471373acd610798c7c [diff] |
am bdef5499: resolved conflicts for merge of f8f0531b to klp-modular-dev-plus-aosp * commit 'bdef5499d4eb0c4f5e6853471373acd610798c7c': logd: core requirement