| commit | 709817b73881138e9f680a84b89fed2a0ddcbd5e | [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 | 7e771d51e15e61877399e65dd22ce3f9a41d9beb | |
| parent | 9d20a16e5986a14e6128bb26a31aaa9e80d333c2 [diff] | |
| parent | 12bac909ab61d4975b4ae7b2201cef2bedcf8f74 [diff] |
am edc1abf1: (-s ours) am 1bb3489e: resolved conflicts for merge of e9c8fb90 to klp-modular-dev-plus-aosp * commit 'edc1abf1bb2659be2a3bd811e050f0c23181a24a': logd: initial checkin.