OSDN Git Service

resolved conflicts for merge of 00aea5c5 to master
authorMathias Agopian <mathias@google.com>
Fri, 12 Jul 2013 21:19:10 +0000 (14:19 -0700)
committerMathias Agopian <mathias@google.com>
Fri, 12 Jul 2013 21:19:10 +0000 (14:19 -0700)
commitcdd7d8bc145bbbd21a1689ed87a381287aeec229
tree3c1baae72f829e2fa0e0412bcee629deeabc7728
parent1bd5068a5180ac12dda374e15c7b1f70e8334284
parent00aea5c5ff9e951024c5751fcce2e8f5602a6460
resolved conflicts for merge of 00aea5c5 to master

Change-Id: Ie1769be863ee2d411eae451907a928db57882e14
services/sensorservice/SensorDevice.cpp
services/sensorservice/SensorDevice.h
services/sensorservice/SensorService.cpp
services/sensorservice/SensorService.h