diff options
| author | Simon Wilson <simonwilson@google.com> | 2012-01-26 15:43:11 -0800 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2012-01-26 15:43:11 -0800 |
| commit | 68c6ce584e307075f37f18e5b9c817f3c7edc0bd (patch) | |
| tree | ef5a414f83687dc42e0d762bc82f1f91ae365c8e /libsensors | |
| parent | a20a1dd52fb2b7757b75d54c66a9eb50d7806ee7 (diff) | |
| parent | 8c61349a99a290f616bc423454eee8ca8ec1c4d2 (diff) | |
| download | device_samsung_tuna-68c6ce584e307075f37f18e5b9c817f3c7edc0bd.zip device_samsung_tuna-68c6ce584e307075f37f18e5b9c817f3c7edc0bd.tar.gz device_samsung_tuna-68c6ce584e307075f37f18e5b9c817f3c7edc0bd.tar.bz2 | |
resolved conflicts for merge of 8c61349a to master
Change-Id: Id432e901f8107a00a7f371e5882b1290a1154961
Diffstat (limited to 'libsensors')
0 files changed, 0 insertions, 0 deletions