fionaxu afed6f8631 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717 am: c95d552de0 ...

am: c10e4fae05

Change-Id: I8e5e9345aa8eeeae5a7af94a4cac892ee8e558ee

2016-06-08 18:24:16 +00:00

..

java

resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717 am: c95d552de0

2016-06-08 18:24:16 +00:00

jni

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

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

res

Import translations. DO NOT MERGE

2016-02-10 09:01:06 -05:00

tests

Tests for getPrimaryHorizontal with grapheme boundaries

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