| commit | 8690233d7a4f0fe4b588da30a13f2f60528bdb6e | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Thu Jan 23 23:26:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 23 23:26:23 2014 +0000 |
| tree | 0172c675284a0c9719a9d8468f414fe2d1025d36 | |
| parent | 5df2f622b93ae895ef28d3081d181d43c99461e1 [diff] | |
| parent | ae2e54faf71f4ff3d96216031c66d14dfbbceb5f [diff] |
am ae2e54fa: resolved conflicts for merge of 017649d6 to klp-modular-dev * commit 'ae2e54faf71f4ff3d96216031c66d14dfbbceb5f': Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.