David Christie 187d841b75 resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 ...

am: 0777ad8253

Change-Id: I9403ca33c0b87ca1ca01f2ce5209c12332b01e51

2016-08-24 22:33:39 +00:00

..

java

resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48

2016-08-24 22:33:39 +00:00

jni

Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"

2015-12-02 01:05:25 +00:00

res

DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support

2016-08-22 11:40:03 -07:00

tests

am c38ffecc: Merge "Moving BTtraffic from experiment location to here" into cw-d-mr1-dev

2015-09-16 22:53:10 +00:00