Julia Reynolds a047d8944b Merge "Allow some notifications in a group to be muted" into oc-dev am: 9685128edf ...

am: 5bc54aad76

Change-Id: If2ba099e67ccdabf756a62858a5244679f9c1547

2017-04-25 20:47:12 +00:00

..

java

Merge "Allow some notifications in a group to be muted" into oc-dev am: 9685128edf

2017-04-25 20:47:12 +00:00

jni

Merge "Allow Bluetooth CAP_SYS_NICE, set RT priority for Bluetooth HAL" into oc-dev am: 6ccc29bba5

2017-04-25 07:53:30 +00:00

proto/android

Add missing services to incident_report

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

res

Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources." into oc-dev

2017-04-24 21:31:25 +00:00

tests

Merge changes from topic 'experio-scoring' into oc-dev am: bad4573bd4

2017-04-25 20:14:37 +00:00