Eugene Susla 7e765db26f Merge "StopScan before each new Companion device scan" into oc-dev ...

am: 611797073f

Change-Id: Ia4d72f6e6d7a1073120152004ea7808636817d0e

2017-04-20 17:57:40 +00:00

..

java

Merge "StopScan before each new Companion device scan" into oc-dev

2017-04-20 17:57:40 +00:00

jni

Merge "Intern Sensor object string using java String.intern()" into oc-dev

2017-04-20 02:01:32 +00:00

proto/android

Add missing services to incident_report

2017-04-17 15:37:57 -07:00

res

Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev

2017-04-20 16:08:24 +00:00

tests

Merge "TextClassifierImpl: Fix empty locale list issue." into oc-dev

2017-04-19 19:25:10 +00:00