| commit | 7300e6474d05bdf2cc034d6e070817bb7484dbe1 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Feb 26 22:39:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 26 22:39:02 2014 +0000 |
| tree | 1f013240eb394f4415f608ae6a22baa36acd0392 | |
| parent | 45c075148e7a18ca204b8d31e0c5b5fe12dc41a1 [diff] | |
| parent | edc1abf1bb2659be2a3bd811e050f0c23181a24a [diff] |
am edc1abf1: (-s ours) am 1bb3489e: resolved conflicts for merge of e9c8fb90 to klp-modular-dev-plus-aosp * commit 'edc1abf1bb2659be2a3bd811e050f0c23181a24a': logd: initial checkin.