Sebastien Hertz b60bc0ece2 resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev ...

Change-Id: I4cb38241b5efab1eb7af161e1589fa477a473a39

2015-08-21 09:53:41 +02:00

..

java

am 4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs

2015-07-14 20:08:00 +00:00

jni

resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev

2015-08-21 09:53:41 +02:00

res

am b6c158f9: Merge "Dump of previous vibrations." into cw-d-mr1-dev

2015-06-29 20:59:50 +00:00

tests

am 4547dac0: Fix one-off error in reporting.

2015-04-28 18:28:18 +00:00