diff options
| author | Ying Wang <wangying@google.com> | 2011-03-15 15:38:37 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-03-15 15:38:37 -0700 |
| commit | 39e4b9ee249d9e326d6d9ccae46be4a974f49286 (patch) | |
| tree | 02fa7a176978484091a386c499ccc61b636b5045 /libsensors | |
| parent | 883abb838f336863195a0256f5f35828199f6544 (diff) | |
| parent | 07248e51c6721d21f399a37912959c8f039fd9bc (diff) | |
| download | device_samsung_crespo-39e4b9ee249d9e326d6d9ccae46be4a974f49286.zip device_samsung_crespo-39e4b9ee249d9e326d6d9ccae46be4a974f49286.tar.gz device_samsung_crespo-39e4b9ee249d9e326d6d9ccae46be4a974f49286.tar.bz2 | |
resolved conflicts for merge of 07248e51 to honeycomb-plus-aosp
Change-Id: I0599b835e8a00a900fcff167fa91929d86c51598
Diffstat (limited to 'libsensors')
0 files changed, 0 insertions, 0 deletions