| commit | edc1abf1bb2659be2a3bd811e050f0c23181a24a | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Feb 26 22:31:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 26 22:31:26 2014 +0000 |
| tree | 437ef06903fc7d217398405e10215e3f2c71f243 | |
| parent | ce72e6c43f69a5368fafe730e0cb83cb1cc3c5b1 [diff] | |
| parent | 1bb3489e600876979146a6222ac5bb2a684702bf [diff] |
am 1bb3489e: resolved conflicts for merge of e9c8fb90 to klp-modular-dev-plus-aosp * commit '1bb3489e600876979146a6222ac5bb2a684702bf': logd: initial checkin.