am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev

* commit '03498d349ae3aa5e429e999b97036d194981373f':
  Adding a HeartRate Feature
tree: f10a135ce183818e05c8050a16bfd4f6b3e92af9
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml