OSDN Git Service

am 66fad0e3: (-s ours) am 61c78d98: Merge "Add heart rate monitor, stringType and...
authorEtienne Le Grand <etn@google.com>
Sat, 5 Apr 2014 17:00:03 +0000 (17:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 5 Apr 2014 17:00:03 +0000 (17:00 +0000)
* commit '66fad0e3e7db1ca02fa0af968008ed02e47c593c':
  Add heart rate monitor, stringType and requiredPermissions to sensors.h


Trivial merge