David Christie 7f2aaf204d resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253 ...

am: 187d841b75

Change-Id: I063f0cd3f53be4d58d123d05da7171a47014929d

2016-08-24 22:43:09 +00:00

..

java

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

2016-08-24 22:43:09 +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

Tests for getPrimaryHorizontal with grapheme boundaries

2016-01-13 18:50:43 +00:00