Vinod Krishnan 6c6fd8ad50 am f2150734: am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev ...

* commit 'f215073420706e29305da762fa5f9f53dcf330ff':
  Adding a HeartRate Feature

2014-05-07 23:44:59 +00:00

..

java

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

2014-05-07 23:44:59 +00:00

jni

Merge "Encapsulate Canvas.mNativeCanvas"

2014-05-07 22:44:47 +00:00

res

am 009def99: Merge "Non-animated checkbox"

2014-05-07 18:40:29 +00:00

tests

Merge changes I0c808d51,I4ecf0ede

2014-05-07 05:48:07 +00:00