Merge "Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)""

Browse source

...

This commit is contained in:

JP Abgrall 2014-04-05 04:48:39 +00:00 committed by Android (Google) Code Review

parent 9275d516fb 8ae345d0c9

commit 926462fa15

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available